Index: src/heap.cc |
diff --git a/src/heap.cc b/src/heap.cc |
index 0691947600c1923049eb3e02fa65422c5b2d369e..0316ebcb98d8dfb6004da00b052c41fcd2291f27 100644 |
--- a/src/heap.cc |
+++ b/src/heap.cc |
@@ -3871,8 +3871,7 @@ MaybeObject* Heap::AllocateExternalStringFromAscii( |
const ExternalAsciiString::Resource* resource) { |
size_t length = resource->length(); |
if (length > static_cast<size_t>(String::kMaxLength)) { |
- isolate()->context()->mark_out_of_memory(); |
- return Failure::OutOfMemoryException(0x5); |
+ return isolate()->ThrowInvalidStringLength(); |
} |
Map* map = external_ascii_string_map(); |
@@ -3894,8 +3893,7 @@ MaybeObject* Heap::AllocateExternalStringFromTwoByte( |
const ExternalTwoByteString::Resource* resource) { |
size_t length = resource->length(); |
if (length > static_cast<size_t>(String::kMaxLength)) { |
- isolate()->context()->mark_out_of_memory(); |
- return Failure::OutOfMemoryException(0x6); |
+ return isolate()->ThrowInvalidStringLength(); |
} |
// For small strings we check whether the resource contains only |
@@ -4980,8 +4978,8 @@ MaybeObject* Heap::AllocateInternalizedStringImpl( |
int size; |
Map* map; |
- if (chars > String::kMaxLength) { |
- return Failure::OutOfMemoryException(0x9); |
+ if (chars < 0 || chars > String::kMaxLength) { |
+ return isolate()->ThrowInvalidStringLength(); |
} |
if (is_one_byte) { |
map = ascii_internalized_string_map(); |
@@ -5029,7 +5027,7 @@ MaybeObject* Heap::AllocateInternalizedStringImpl<false>( |
MaybeObject* Heap::AllocateRawOneByteString(int length, |
PretenureFlag pretenure) { |
if (length < 0 || length > String::kMaxLength) { |
- return Failure::OutOfMemoryException(0xb); |
+ return isolate()->ThrowInvalidStringLength(); |
} |
int size = SeqOneByteString::SizeFor(length); |
ASSERT(size <= SeqOneByteString::kMaxSize); |
@@ -5053,7 +5051,7 @@ MaybeObject* Heap::AllocateRawOneByteString(int length, |
MaybeObject* Heap::AllocateRawTwoByteString(int length, |
PretenureFlag pretenure) { |
if (length < 0 || length > String::kMaxLength) { |
- return Failure::OutOfMemoryException(0xc); |
+ return isolate()->ThrowInvalidStringLength(); |
} |
int size = SeqTwoByteString::SizeFor(length); |
ASSERT(size <= SeqTwoByteString::kMaxSize); |