Fixed string.split: always convert non-regexp separator to string.
BUG=v8:1711 TEST=mjsunit/regress/regress-1711.js Review URL: http://codereview.chromium.org/7976046 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9371 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
fdade92c20
commit
b7cac76bae
@ -568,7 +568,6 @@ function StringSplit(separator, limit) {
|
||||
}
|
||||
var subject = TO_STRING_INLINE(this);
|
||||
limit = (IS_UNDEFINED(limit)) ? 0xffffffff : TO_UINT32(limit);
|
||||
if (limit === 0) return [];
|
||||
|
||||
// ECMA-262 says that if separator is undefined, the result should
|
||||
// be an array of size 1 containing the entire string. SpiderMonkey
|
||||
@ -582,6 +581,9 @@ function StringSplit(separator, limit) {
|
||||
var length = subject.length;
|
||||
if (!IS_REGEXP(separator)) {
|
||||
separator = TO_STRING_INLINE(separator);
|
||||
|
||||
if (limit === 0) return [];
|
||||
|
||||
var separator_length = separator.length;
|
||||
|
||||
// If the separator string is empty then return the elements in the subject.
|
||||
@ -592,6 +594,8 @@ function StringSplit(separator, limit) {
|
||||
return result;
|
||||
}
|
||||
|
||||
if (limit === 0) return [];
|
||||
|
||||
%_Log('regexp', 'regexp-split,%0S,%1r', [subject, separator]);
|
||||
|
||||
if (length === 0) {
|
||||
|
38
test/mjsunit/regress/regress-1711.js
Normal file
38
test/mjsunit/regress/regress-1711.js
Normal file
@ -0,0 +1,38 @@
|
||||
// Copyright 2011 the V8 project authors. All rights reserved.
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following
|
||||
// disclaimer in the documentation and/or other materials provided
|
||||
// with the distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived
|
||||
// from this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// string.split needs to evaluate the separator's toString even if limit
|
||||
// is 0 because toString may have side effects.
|
||||
|
||||
var side_effect = false;
|
||||
var separator = new Object();
|
||||
separator.toString = function() {
|
||||
side_effect = true;
|
||||
return undefined;
|
||||
}
|
||||
'subject'.split(separator, 0);
|
||||
assertTrue(side_effect);
|
Loading…
Reference in New Issue
Block a user