commit 84ca27a09ebd6a65cd23ee52d835d89cbe06c574
author Alexander Aprelev <aam@google.com> Mon Jul 09 21:45:07 2018 +0000
committer Alexander Aprelev <aam@google.com> Mon Jul 09 21:45:07 2018 +0000
tree ac433636177629a78e29e5f4300bb02e6e875063
parent 5403f654aea2764cf41381caa1a98ee6951d6df4

Fix File::OpenUri on Windows.

This is follow-up to c5c18a0ace7e4cb6f827ad3a5b80fae15d3e7b3f.

Bug: dartbug.com/33793
Change-Id: Ic281c11ea5a2c4e10cdccb0617a12b6dfbda1c68
Reviewed-on: https://dart-review.googlesource.com/64243
Reviewed-by: Zach Anderson <zra@google.com>

runtime/bin/file_win.cc

diff --git a/runtime/bin/file_win.cc b/runtime/bin/file_win.cc
index 9c486cc..d7d5b3f 100644
--- a/runtime/bin/file_win.cc
+++ b/runtime/bin/file_win.cc
@@ -282,7 +282,13 @@
 }
 
 File* File::OpenUri(Namespace* namespc, const char* uri, FileOpenMode mode) {
-  Utf8ToWideScope uri_w(uri);
+  UriDecoder uri_decoder(uri);
+  if (uri_decoder.decoded() == NULL) {
+    SetLastError(ERROR_INVALID_NAME);
+    return NULL;
+  }
+
+  Utf8ToWideScope uri_w(uri_decoder.decoded());
   if (!UrlIsFileUrlW(uri_w.wide())) {
     return FileOpenW(uri_w.wide(), mode);
   }