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

Side by Side Diff: src/api.cc

Issue 2683903002: Fix missing cases of empty_string canonicalization (Closed)
Patch Set: Created 3 years, 10 months 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 | src/arm/macro-assembler-arm.h » ('j') | src/arm/macro-assembler-arm.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/api.h" 5 #include "src/api.h"
6 6
7 #include <string.h> // For memcpy, strlen. 7 #include <string.h> // For memcpy, strlen.
8 #ifdef V8_USE_ADDRESS_SANITIZER 8 #ifdef V8_USE_ADDRESS_SANITIZER
9 #include <sanitizer/asan_interface.h> 9 #include <sanitizer/asan_interface.h>
10 #endif // V8_USE_ADDRESS_SANITIZER 10 #endif // V8_USE_ADDRESS_SANITIZER
(...skipping 6705 matching lines...) Expand 10 before | Expand all | Expand 10 after
6716 MaybeLocal<String> v8::String::NewExternalTwoByte( 6716 MaybeLocal<String> v8::String::NewExternalTwoByte(
6717 Isolate* isolate, v8::String::ExternalStringResource* resource) { 6717 Isolate* isolate, v8::String::ExternalStringResource* resource) {
6718 CHECK(resource && resource->data()); 6718 CHECK(resource && resource->data());
6719 // TODO(dcarney): throw a context free exception. 6719 // TODO(dcarney): throw a context free exception.
6720 if (resource->length() > static_cast<size_t>(i::String::kMaxLength)) { 6720 if (resource->length() > static_cast<size_t>(i::String::kMaxLength)) {
6721 return MaybeLocal<String>(); 6721 return MaybeLocal<String>();
6722 } 6722 }
6723 i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); 6723 i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
6724 ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate); 6724 ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate);
6725 LOG_API(i_isolate, String, NewExternalTwoByte); 6725 LOG_API(i_isolate, String, NewExternalTwoByte);
6726 i::Handle<i::String> string = i_isolate->factory() 6726 if (resource->length() > 0) {
6727 ->NewExternalStringFromTwoByte(resource) 6727 i::Handle<i::String> string = i_isolate->factory()
6728 .ToHandleChecked(); 6728 ->NewExternalStringFromTwoByte(resource)
6729 i_isolate->heap()->RegisterExternalString(*string); 6729 .ToHandleChecked();
6730 return Utils::ToLocal(string); 6730 i_isolate->heap()->RegisterExternalString(*string);
6731 return Utils::ToLocal(string);
6732 } else {
6733 return Utils::ToLocal(i_isolate->factory()->empty_string());
6734 }
6731 } 6735 }
6732 6736
6733 6737
6734 Local<String> v8::String::NewExternal( 6738 Local<String> v8::String::NewExternal(
6735 Isolate* isolate, v8::String::ExternalStringResource* resource) { 6739 Isolate* isolate, v8::String::ExternalStringResource* resource) {
6736 RETURN_TO_LOCAL_UNCHECKED(NewExternalTwoByte(isolate, resource), String); 6740 RETURN_TO_LOCAL_UNCHECKED(NewExternalTwoByte(isolate, resource), String);
6737 } 6741 }
6738 6742
6739 6743
6740 MaybeLocal<String> v8::String::NewExternalOneByte( 6744 MaybeLocal<String> v8::String::NewExternalOneByte(
6741 Isolate* isolate, v8::String::ExternalOneByteStringResource* resource) { 6745 Isolate* isolate, v8::String::ExternalOneByteStringResource* resource) {
6742 CHECK(resource && resource->data()); 6746 CHECK(resource && resource->data());
6743 // TODO(dcarney): throw a context free exception. 6747 // TODO(dcarney): throw a context free exception.
6744 if (resource->length() > static_cast<size_t>(i::String::kMaxLength)) { 6748 if (resource->length() > static_cast<size_t>(i::String::kMaxLength)) {
6745 return MaybeLocal<String>(); 6749 return MaybeLocal<String>();
6746 } 6750 }
6747 i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); 6751 i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
6748 ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate); 6752 ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate);
6749 LOG_API(i_isolate, String, NewExternalOneByte); 6753 LOG_API(i_isolate, String, NewExternalOneByte);
6750 i::Handle<i::String> string = i_isolate->factory() 6754 if (resource->length() > 0) {
6751 ->NewExternalStringFromOneByte(resource) 6755 i::Handle<i::String> string = i_isolate->factory()
6752 .ToHandleChecked(); 6756 ->NewExternalStringFromOneByte(resource)
6753 i_isolate->heap()->RegisterExternalString(*string); 6757 .ToHandleChecked();
6754 return Utils::ToLocal(string); 6758 i_isolate->heap()->RegisterExternalString(*string);
6759 return Utils::ToLocal(string);
6760 } else {
6761 return Utils::ToLocal(i_isolate->factory()->empty_string());
6762 }
6755 } 6763 }
6756 6764
6757 6765
6758 Local<String> v8::String::NewExternal( 6766 Local<String> v8::String::NewExternal(
6759 Isolate* isolate, v8::String::ExternalOneByteStringResource* resource) { 6767 Isolate* isolate, v8::String::ExternalOneByteStringResource* resource) {
6760 RETURN_TO_LOCAL_UNCHECKED(NewExternalOneByte(isolate, resource), String); 6768 RETURN_TO_LOCAL_UNCHECKED(NewExternalOneByte(isolate, resource), String);
6761 } 6769 }
6762 6770
6763 6771
6764 bool v8::String::MakeExternal(v8::String::ExternalStringResource* resource) { 6772 bool v8::String::MakeExternal(v8::String::ExternalStringResource* resource) {
(...skipping 3371 matching lines...) Expand 10 before | Expand all | Expand 10 after
10136 Address callback_address = 10144 Address callback_address =
10137 reinterpret_cast<Address>(reinterpret_cast<intptr_t>(callback)); 10145 reinterpret_cast<Address>(reinterpret_cast<intptr_t>(callback));
10138 VMState<EXTERNAL> state(isolate); 10146 VMState<EXTERNAL> state(isolate);
10139 ExternalCallbackScope call_scope(isolate, callback_address); 10147 ExternalCallbackScope call_scope(isolate, callback_address);
10140 callback(info); 10148 callback(info);
10141 } 10149 }
10142 10150
10143 10151
10144 } // namespace internal 10152 } // namespace internal
10145 } // namespace v8 10153 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | src/arm/macro-assembler-arm.h » ('j') | src/arm/macro-assembler-arm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698