Version 2.13.3
* Cherry-pick 30321de7879fca4ebf7c8606687f24c3befba1e2 to stable
* Cherry-pick f827c533156578aae356ef1b75f24a43107faca0 to stable
* Cherry-pick 05e5427800f43d0a9bac6b3a77e8e5f65c84812c to stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41f138e..49083063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.13.2 - 2021-06-09
+## 2.13.3 - 2021-06-10
This is a patch release that fixes:
diff --git a/runtime/bin/file_system_watcher.cc b/runtime/bin/file_system_watcher.cc
index a32d62b..66e55b5 100644
--- a/runtime/bin/file_system_watcher.cc
+++ b/runtime/bin/file_system_watcher.cc
@@ -14,6 +14,8 @@
namespace dart {
namespace bin {
+bool FileSystemWatcher::delayed_filewatch_callback_ = false;
+
void FUNCTION_NAME(FileSystemWatcher_IsSupported)(Dart_NativeArguments args) {
Dart_SetBooleanReturnValue(args, FileSystemWatcher::IsSupported());
}
diff --git a/runtime/bin/file_system_watcher.h b/runtime/bin/file_system_watcher.h
index c9a54e7..364c608 100644
--- a/runtime/bin/file_system_watcher.h
+++ b/runtime/bin/file_system_watcher.h
@@ -48,7 +48,15 @@
static intptr_t GetSocketId(intptr_t id, intptr_t path_id);
static Dart_Handle ReadEvents(intptr_t id, intptr_t path_id);
+ static void set_delayed_filewatch_callback(bool value) {
+ delayed_filewatch_callback_ = value;
+ }
+ static bool delayed_filewatch_callback() {
+ return delayed_filewatch_callback_;
+ }
+
private:
+ static bool delayed_filewatch_callback_;
DISALLOW_COPY_AND_ASSIGN(FileSystemWatcher);
};
diff --git a/runtime/bin/file_system_watcher_macos.cc b/runtime/bin/file_system_watcher_macos.cc
index 88d6986..2cde121 100644
--- a/runtime/bin/file_system_watcher_macos.cc
+++ b/runtime/bin/file_system_watcher_macos.cc
@@ -61,7 +61,6 @@
int write_fd,
bool recursive)
: watcher_(watcher),
- ready_(false),
base_path_length_(strlen(base_path)),
path_ref_(CFStringCreateWithCString(NULL,
base_path,
@@ -74,9 +73,14 @@
}
~Node() {
- Stop();
+ // This is invoked outside of [Callback] execution because
+ // [context.release] callback is invoked when [FSEventStream] is
+ // deallocated, the same [FSEventStream] that [Callback] gets a reference
+ // to during its execution. [Callback] holding a reference prevents stream
+ // from deallocation.
close(write_fd_);
CFRelease(path_ref_);
+ watcher_ = nullptr; // this is to catch access-after-free in Callback
}
void set_ref(FSEventStreamRef ref) { ref_ = ref; }
@@ -85,6 +89,9 @@
FSEventStreamContext context;
memset(&context, 0, sizeof(context));
context.info = reinterpret_cast<void*>(this);
+ context.release = [](const void* info) {
+ delete static_cast<const Node*>(info);
+ };
CFArrayRef array = CFArrayCreate(
NULL, reinterpret_cast<const void**>(&path_ref_), 1, NULL);
FSEventStreamRef ref = FSEventStreamCreate(
@@ -93,7 +100,6 @@
CFRelease(array);
set_ref(ref);
- ready_.store(true, std::memory_order_release);
FSEventStreamScheduleWithRunLoop(ref_, watcher_->run_loop_,
kCFRunLoopDefaultMode);
@@ -103,15 +109,12 @@
}
void Stop() {
- ASSERT(ready_);
FSEventStreamStop(ref_);
FSEventStreamInvalidate(ref_);
FSEventStreamRelease(ref_);
- ready_.store(false, std::memory_order_release);
}
FSEventsWatcher* watcher() const { return watcher_; }
- bool ready() const { return ready_.load(std::memory_order_acquire); }
intptr_t base_path_length() const { return base_path_length_; }
int read_fd() const { return read_fd_; }
int write_fd() const { return write_fd_; }
@@ -119,7 +122,6 @@
private:
FSEventsWatcher* watcher_;
- std::atomic<bool> ready_;
intptr_t base_path_length_;
CFStringRef path_ref_;
int read_fd_;
@@ -218,12 +220,15 @@
void* event_paths,
const FSEventStreamEventFlags event_flags[],
const FSEventStreamEventId event_ids[]) {
- Node* node = reinterpret_cast<Node*>(client);
+ if (FileSystemWatcher::delayed_filewatch_callback()) {
+ // Used in tests to highlight race between callback invocation
+ // and unwatching the file path, Node destruction
+ TimerUtils::Sleep(1000 /* ms */);
+ }
+ Node* node = static_cast<Node*>(client);
+ RELEASE_ASSERT(node->watcher() != nullptr);
ASSERT(Thread::Compare(node->watcher()->threadId_,
Thread::GetCurrentThreadId()));
- if (!node->ready()) {
- return;
- }
for (size_t i = 0; i < num_events; i++) {
char* path = reinterpret_cast<char**>(event_paths)[i];
FSEvent event;
@@ -274,7 +279,7 @@
void FileSystemWatcher::UnwatchPath(intptr_t id, intptr_t path_id) {
USE(id);
- delete reinterpret_cast<FSEventsWatcher::Node*>(path_id);
+ reinterpret_cast<FSEventsWatcher::Node*>(path_id)->Stop();
}
intptr_t FileSystemWatcher::GetSocketId(intptr_t id, intptr_t path_id) {
diff --git a/runtime/bin/main_options.cc b/runtime/bin/main_options.cc
index e60f6c8..c90736b 100644
--- a/runtime/bin/main_options.cc
+++ b/runtime/bin/main_options.cc
@@ -10,6 +10,7 @@
#include "bin/dartdev_isolate.h"
#include "bin/error_exit.h"
+#include "bin/file_system_watcher.h"
#include "bin/options.h"
#include "bin/platform.h"
#include "bin/utils.h"
@@ -472,6 +473,9 @@
Options::long_ssl_cert_evaluation());
#endif // !defined(DART_IO_SECURE_SOCKET_DISABLED)
+ FileSystemWatcher::set_delayed_filewatch_callback(
+ Options::delayed_filewatch_callback());
+
// The arguments to the VM are at positions 1 through i-1 in argv.
Platform::SetExecutableArguments(i, argv);
diff --git a/runtime/bin/main_options.h b/runtime/bin/main_options.h
index 658cea3..4fab09c 100644
--- a/runtime/bin/main_options.h
+++ b/runtime/bin/main_options.h
@@ -48,7 +48,9 @@
V(suppress_core_dump, suppress_core_dump) \
V(enable_service_port_fallback, enable_service_port_fallback) \
V(disable_dart_dev, disable_dart_dev) \
- V(long_ssl_cert_evaluation, long_ssl_cert_evaluation)
+ V(long_ssl_cert_evaluation, long_ssl_cert_evaluation) \
+ V(bypass_trusting_system_roots, bypass_trusting_system_roots) \
+ V(delayed_filewatch_callback, delayed_filewatch_callback)
// Boolean flags that have a short form.
#define SHORT_BOOL_OPTIONS_LIST(V) \
diff --git a/runtime/tests/vm/dart/transferable_throws_oom_test.dart b/runtime/tests/vm/dart/transferable_throws_oom_test.dart
index 6930795..8e95792 100644
--- a/runtime/tests/vm/dart/transferable_throws_oom_test.dart
+++ b/runtime/tests/vm/dart/transferable_throws_oom_test.dart
@@ -26,7 +26,7 @@
// Attempt to create total 1tb uint8list which should fail on 32 and 64-bit
// platforms.
final bytes100MB = Uint8List(100 * 1024 * 1024);
- final total1TB = List<Uint8List>.filled(10000, bytes100MB);
- // Try to make a 1 TB transferable.
- Expect.throws(() => TransferableTypedData.fromList(total1TB));
+ final total1PB = List<Uint8List>.filled(10 * 1000 * 1000, bytes100MB);
+ // Try to make a 1 PB transferable.
+ Expect.throws(() => TransferableTypedData.fromList(total1PB));
}
diff --git a/runtime/tests/vm/dart_2/transferable_throws_oom_test.dart b/runtime/tests/vm/dart_2/transferable_throws_oom_test.dart
index 6930795..8e95792 100644
--- a/runtime/tests/vm/dart_2/transferable_throws_oom_test.dart
+++ b/runtime/tests/vm/dart_2/transferable_throws_oom_test.dart
@@ -26,7 +26,7 @@
// Attempt to create total 1tb uint8list which should fail on 32 and 64-bit
// platforms.
final bytes100MB = Uint8List(100 * 1024 * 1024);
- final total1TB = List<Uint8List>.filled(10000, bytes100MB);
- // Try to make a 1 TB transferable.
- Expect.throws(() => TransferableTypedData.fromList(total1TB));
+ final total1PB = List<Uint8List>.filled(10 * 1000 * 1000, bytes100MB);
+ // Try to make a 1 PB transferable.
+ Expect.throws(() => TransferableTypedData.fromList(total1PB));
}
diff --git a/tests/standalone/io/file_system_watcher_large_set_test.dart b/tests/standalone/io/file_system_watcher_large_set_test.dart
new file mode 100644
index 0000000..0f010cf
--- /dev/null
+++ b/tests/standalone/io/file_system_watcher_large_set_test.dart
@@ -0,0 +1,40 @@
+// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// VMOptions=--delayed-filewatch-callback --enable-isolate-groups --experimental-enable-isolate-groups-jit
+// VMOptions=--delayed-filewatch-callback --no-enable-isolate-groups
+
+// Verifies that cancelling subscription from inside of the event handler
+// works as expected, does not result in crash or hang.
+
+import "dart:async";
+import "dart:io";
+
+import "package:path/path.dart";
+
+final completer = Completer<void>();
+late StreamSubscription subscription;
+
+void handleWatchEvent(event) {
+ if (event is FileSystemCreateEvent && event.path.endsWith('txt')) {
+ subscription.cancel();
+ completer.complete();
+ }
+}
+
+void main() async {
+ if (!FileSystemEntity.isWatchSupported) return;
+ final dir = Directory.systemTemp.createTempSync('dart_file_system_watcher');
+ final watcher = dir.watch();
+ subscription = watcher.listen(handleWatchEvent);
+
+ print('watching ${dir.path}');
+ for (int i = 0; i < 1000; i++) {
+ File(join(dir.path, 'file_$i.txt')).createSync();
+ }
+ await completer.future;
+ try {
+ dir.deleteSync(recursive: true);
+ } catch (_) {}
+}
diff --git a/tests/standalone_2/io/file_system_watcher_large_set_test.dart b/tests/standalone_2/io/file_system_watcher_large_set_test.dart
new file mode 100644
index 0000000..9b3e290
--- /dev/null
+++ b/tests/standalone_2/io/file_system_watcher_large_set_test.dart
@@ -0,0 +1,40 @@
+// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// VMOptions=--delayed-filewatch-callback --enable-isolate-groups --experimental-enable-isolate-groups-jit
+// VMOptions=--delayed-filewatch-callback --no-enable-isolate-groups
+
+// Verifies that cancelling subscription from inside of the event handler
+// works as expected, does not result in crash or hang.
+
+import "dart:async";
+import "dart:io";
+
+import "package:path/path.dart";
+
+final completer = Completer<void>();
+var subscription;
+
+void handleWatchEvent(event) {
+ if (event is FileSystemCreateEvent && event.path.endsWith('txt')) {
+ subscription.cancel();
+ completer.complete();
+ }
+}
+
+void main() async {
+ if (!FileSystemEntity.isWatchSupported) return;
+ final dir = Directory.systemTemp.createTempSync('dart_file_system_watcher');
+ final watcher = dir.watch();
+ subscription = watcher.listen(handleWatchEvent);
+
+ print('watching ${dir.path}');
+ for (int i = 0; i < 1000; i++) {
+ File(join(dir.path, 'file_$i.txt')).createSync();
+ }
+ await completer.future;
+ try {
+ dir.deleteSync(recursive: true);
+ } catch (_) {}
+}
diff --git a/tools/VERSION b/tools/VERSION
index 4bed353..5bfdc48 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
CHANNEL stable
MAJOR 2
MINOR 13
-PATCH 2
+PATCH 3
PRERELEASE 0
PRERELEASE_PATCH 0
\ No newline at end of file
