Revision: 9982
Author: [email protected]
Date: Fri Nov 11 09:49:27 2011
Log: Merging r9980 into 3.6 branch (Catch OOM when sparse array join
results in too large array).
http://code.google.com/p/v8/source/detail?r=9982
Modified:
/branches/3.6/src/runtime.cc
/branches/3.6/src/version.cc
=======================================
--- /branches/3.6/src/runtime.cc Tue Nov 8 07:26:03 2011
+++ /branches/3.6/src/runtime.cc Fri Nov 11 09:49:27 2011
@@ -6841,7 +6841,12 @@
// Find total length of join result.
int string_length = 0;
bool is_ascii = separator->IsAsciiRepresentation();
- int max_string_length = SeqAsciiString::kMaxLength;
+ int max_string_length;
+ if (is_ascii) {
+ max_string_length = SeqAsciiString::kMaxLength;
+ } else {
+ max_string_length = SeqTwoByteString::kMaxLength;
+ }
bool overflow = false;
CONVERT_NUMBER_CHECKED(int, elements_length,
Int32, elements_array->length());
=======================================
--- /branches/3.6/src/version.cc Tue Nov 8 07:26:03 2011
+++ /branches/3.6/src/version.cc Fri Nov 11 09:49:27 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 6
#define BUILD_NUMBER 6
-#define PATCH_LEVEL 7
+#define PATCH_LEVEL 8
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
