| Index: src/heap.cc
|
| diff --git a/src/heap.cc b/src/heap.cc
|
| index e785629fa480423a04505eda1de855d2582696d2..16b21eaf22516a4143013252d157562cc718ae96 100644
|
| --- a/src/heap.cc
|
| +++ b/src/heap.cc
|
| @@ -3866,7 +3866,7 @@ MaybeObject* Heap::AllocateExternalStringFromAscii(
|
| const ExternalAsciiString::Resource* resource) {
|
| size_t length = resource->length();
|
| if (length > static_cast<size_t>(String::kMaxLength)) {
|
| - v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true);
|
| + return isolate()->ThrowInvalidStringLength();
|
| }
|
|
|
| Map* map = external_ascii_string_map();
|
| @@ -3888,7 +3888,7 @@ MaybeObject* Heap::AllocateExternalStringFromTwoByte(
|
| const ExternalTwoByteString::Resource* resource) {
|
| size_t length = resource->length();
|
| if (length > static_cast<size_t>(String::kMaxLength)) {
|
| - v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true);
|
| + return isolate()->ThrowInvalidStringLength();
|
| }
|
|
|
| // For small strings we check whether the resource contains only
|
| @@ -4973,8 +4973,8 @@ MaybeObject* Heap::AllocateInternalizedStringImpl(
|
| int size;
|
| Map* map;
|
|
|
| - if (chars > String::kMaxLength) {
|
| - v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true);
|
| + if (chars < 0 || chars > String::kMaxLength) {
|
| + return isolate()->ThrowInvalidStringLength();
|
| }
|
| if (is_one_byte) {
|
| map = ascii_internalized_string_map();
|
| @@ -5022,7 +5022,7 @@ MaybeObject* Heap::AllocateInternalizedStringImpl<false>(
|
| MaybeObject* Heap::AllocateRawOneByteString(int length,
|
| PretenureFlag pretenure) {
|
| if (length < 0 || length > String::kMaxLength) {
|
| - v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true);
|
| + return isolate()->ThrowInvalidStringLength();
|
| }
|
| int size = SeqOneByteString::SizeFor(length);
|
| ASSERT(size <= SeqOneByteString::kMaxSize);
|
| @@ -5046,7 +5046,7 @@ MaybeObject* Heap::AllocateRawOneByteString(int length,
|
| MaybeObject* Heap::AllocateRawTwoByteString(int length,
|
| PretenureFlag pretenure) {
|
| if (length < 0 || length > String::kMaxLength) {
|
| - v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true);
|
| + return isolate()->ThrowInvalidStringLength();
|
| }
|
| int size = SeqTwoByteString::SizeFor(length);
|
| ASSERT(size <= SeqTwoByteString::kMaxSize);
|
|
|