Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: runtime/vm/object.cc

Issue 2537253002: Fixed assert causing crash when attempting to load a library from an invalid path. (Closed)
Patch Set: Addressed comments from initial upload Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tests/language/vm/regress_27201_lib.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/object.h" 5 #include "vm/object.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/assembler.h" 9 #include "vm/assembler.h"
10 #include "vm/become.h" 10 #include "vm/become.h"
(...skipping 10990 matching lines...) Expand 10 before | Expand all | Expand 10 after
11001 TransitionVMToNative transition(thread); 11001 TransitionVMToNative transition(thread);
11002 Api::Scope api_scope(thread); 11002 Api::Scope api_scope(thread);
11003 obj = Api::UnwrapHandle(handler(Dart_kImportTag, 11003 obj = Api::UnwrapHandle(handler(Dart_kImportTag,
11004 Api::NewHandle(thread, importer()), 11004 Api::NewHandle(thread, importer()),
11005 Api::NewHandle(thread, lib_url.raw()))); 11005 Api::NewHandle(thread, lib_url.raw())));
11006 } 11006 }
11007 if (obj.IsError()) { 11007 if (obj.IsError()) {
11008 Exceptions::PropagateError(Error::Cast(obj)); 11008 Exceptions::PropagateError(Error::Cast(obj));
11009 } 11009 }
11010 } else { 11010 } else {
11011 // Another load request is in flight. 11011 // Another load request is in flight or previously failed.
11012 ASSERT(deferred_lib.LoadRequested()); 11012 ASSERT(deferred_lib.LoadRequested() || deferred_lib.LoadFailed());
11013 } 11013 }
11014 return false; // Load request not yet completed. 11014 return false; // Load request not yet completed.
11015 } 11015 }
11016 11016
11017 11017
11018 RawArray* LibraryPrefix::dependent_code() const { 11018 RawArray* LibraryPrefix::dependent_code() const {
11019 return raw_ptr()->dependent_code_; 11019 return raw_ptr()->dependent_code_;
11020 } 11020 }
11021 11021
11022 11022
(...skipping 11741 matching lines...) Expand 10 before | Expand all | Expand 10 after
22764 return UserTag::null(); 22764 return UserTag::null();
22765 } 22765 }
22766 22766
22767 22767
22768 const char* UserTag::ToCString() const { 22768 const char* UserTag::ToCString() const {
22769 const String& tag_label = String::Handle(label()); 22769 const String& tag_label = String::Handle(label());
22770 return tag_label.ToCString(); 22770 return tag_label.ToCString();
22771 } 22771 }
22772 22772
22773 } // namespace dart 22773 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | tests/language/vm/regress_27201_lib.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698