languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-05 18:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "fix hanging of write on Windows"

Browse source 
This reverts commit eb075dcc21.

Reason for revert: Out of memory on IA32 and On MacOS, invalid path argument on MacOS.

Original change's description:
> fix hanging of write on Windows
> 
> When using File::Write(), Var size in int64_t is casted to DWORD(unsigned long). When Var size is out of DWORD range, casted value will be zero. Before calling into File::Write() on Windows, validate the size.
> 
> Bug: https://github.com/dart-lang/sdk/issues/40339
> Change-Id: I36fade62dfa3025f418405cb3e45c286dd6b7db1
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134440
> Reviewed-by: Zach Anderson <zra@google.com>
> Commit-Queue: Zichang Guo <zichangguo@google.com>

TBR=zra@google.com,asiva@google.com,zichangguo@google.com

Change-Id: I9d515912ad99f523c6d19fac0c8fbbb23a897986
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: https://github.com/dart-lang/sdk/issues/40339
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134768
Reviewed-by: Zichang Guo <zichangguo@google.com>
Commit-Queue: Zichang Guo <zichangguo@google.com>
This commit is contained in:
Zichang Guo 2020-02-06 20:34:32 +00:00 committed by commit-bot@chromium.org
parent a98f4acd1a
commit 748bbb720a
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
runtime/bin/file_win.cc
View file

@ -146,15 +146,10 @@ int64_t File::Read(void* buffer, int64_t num_bytes) {
int64_t File::Write(const void* buffer, int64_t num_bytes) {
int fd = handle_->fd();
// TODO(zichangguo): num_bytes from signed integer to unsigned integer.
ASSERT(fd >= 0 && num_bytes >= 0);
ASSERT(fd >= 0);
HANDLE handle = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
// On Windows, int64_t is much larger than required size DWORD(unsigned long).
// Limit the size to be a valid DWORD(unsigned long).
COMPILE_ASSERT(sizeof(uint32_t) == sizeof(DWORD));
DWORD bytes_to_write = num_bytes > MAXDWORD ? MAXDWORD : num_bytes;
DWORD written = 0;
BOOL result = WriteFile(handle, buffer, bytes_to_write, &written, NULL);
BOOL result = WriteFile(handle, buffer, num_bytes, &written, NULL);
if (!result) {
return -1;
}

15
tests/standalone_2/io/file_write_as_test.dart
View file

@ -4,7 +4,6 @@
import 'dart:async';
import 'dart:io';
import 'dart:typed_data';
import "package:async_helper/async_helper.dart";
import "package:expect/expect.dart";
@ -28,19 +27,6 @@ testWriteAsStringSync(dir) {
Expect.equals('$data$data', f.readAsStringSync());
}
testWriteWithLargeList(dir) {
var f;
if (Platform.isWindows) {
f = File('NUL');
} else {
f = File('/dev/null');
}
// 0x100000000 exceeds the maximum of unsigned long.
// This should no longer hang.
// Issue: https://github.com/dart-lang/sdk/issues/40339
f.writeAsBytesSync(Uint8List(0x100000000));
}
Future testWriteAsBytes(dir) {
var completer = new Completer();
var f = new File('${dir.path}/bytes.txt');
@ -87,7 +73,6 @@ main() {
var tempDir = Directory.systemTemp.createTempSync('dart_file_write_as');
testWriteAsBytesSync(tempDir);
testWriteAsStringSync(tempDir);
testWriteWithLargeList(tempDir);
testWriteAsBytes(tempDir).then((_) {
return testWriteAsString(tempDir);
}).then((_) {