Changeset 185909 in webkit

Timestamp:

Jun 24, 2015, 7:18:16 AM (10 years ago)

Author:

mark.lam@apple.com

Message:

Fixed assertion in JSStringJoiner::join() (regression from r185899).

Not reviewed.

JSStringJoiner did not account for the case where the array being joined can
have null or undefined elements. As a result, its size may be less than
its initially reserved capacity (which was estimated based on the array length).

• runtime/JSStringJoiner.cpp:

(JSC::JSStringJoiner::join):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSStringJoiner.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-06-24  Mark Lam  <mark.lam@apple.com>
+
+        Fixed assertion in JSStringJoiner::join() (regression from r185899).
+
+        Not reviewed.
+
+        JSStringJoiner did not account for the case where the array being joined can
+        have null or undefined elements.  As a result, its size may be less than
+        its initially reserved capacity (which was estimated based on the array length).
+
+        * runtime/JSStringJoiner.cpp:
+        (JSC::JSStringJoiner::join):
+
 2015-06-24  Darin Adler  <darin@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp

@@ -96 +96 @@
 JSValue JSStringJoiner::join(ExecState& state)
 {
-    ASSERT(m_strings.size() == m_strings.capacity());
+    ASSERT(m_strings.size() <= m_strings.capacity());
 
     unsigned length = joinedLength(state);