Chromium Code Reviews| Index: runtime/bin/loader.cc |
| diff --git a/runtime/bin/loader.cc b/runtime/bin/loader.cc |
| index f93f3e856c3ae428cc8e80ab83e043e1d2d005fd..9d9a6c974af6815665f6b5a1358fa5a4a9120b89 100644 |
| --- a/runtime/bin/loader.cc |
| +++ b/runtime/bin/loader.cc |
| @@ -296,8 +296,9 @@ bool Loader::ProcessResultLocked(Loader* loader, Loader::IOResult* result) { |
| ASSERT(library_uri != Dart_Null()); |
| Dart_Handle library = Dart_LookupLibrary(library_uri); |
| ASSERT(!Dart_IsError(library)); |
| - const char* lib_path_str = reinterpret_cast<const char*>(result->payload); |
| + const char* lib_uri = reinterpret_cast<const char*>(result->payload); |
| const char* extension_uri = reinterpret_cast<const char*>(result->uri); |
| + const char* lib_path = DartUtils::RemoveScheme(lib_uri); |
| const char* extension_path = DartUtils::RemoveScheme(extension_uri); |
| if (strchr(extension_path, '/') != NULL || |
| (IsWindowsHost() && strchr(extension_path, '\\') != NULL)) { |
| @@ -306,7 +307,7 @@ bool Loader::ProcessResultLocked(Loader* loader, Loader::IOResult* result) { |
| extension_path); |
| return false; |
| } |
| - Dart_Handle result = Extensions::LoadExtension(lib_path_str, |
| + Dart_Handle result = Extensions::LoadExtension(lib_path, |
|
rmacnak
2016/07/15 19:28:30
This bypasses the check for http or https in LoadE
Cutch
2016/07/15 19:58:43
Done.
|
| extension_path, |
| library); |
| if (Dart_IsError(result)) { |