[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:51:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 33e2f628ca2b558b9a7b9ce366a3dc1749c600ae
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 16 22:56:24 2004 +0000
Reviewed by Maciej.
- fixed <rdar://problem/3714644> REGRESSION (125.8-146): bugzilla submit link
hangs browser with javascript
* kjs/array_object.cpp:
(ArrayProtoFuncImp::call):
Check for undefined type for args[0] the same way we were already checking
for args[1]. In this case, args was zero-length, but we were treating
args[0] like an integer anyway. Resulted in some code looping from a NAN
value to 4, taking approximately forever.
* JavaScriptCore.pbproj/project.pbxproj:
version wars
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7047 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a261a3a..13ecd6b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2004-07-16 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed <rdar://problem/3714644> REGRESSION (125.8-146): bugzilla submit link
+ hangs browser with javascript
+
+ * kjs/array_object.cpp:
+ (ArrayProtoFuncImp::call):
+ Check for undefined type for args[0] the same way we were already checking
+ for args[1]. In this case, args was zero-length, but we were treating
+ args[0] like an integer anyway. Resulted in some code looping from a NAN
+ value to 4, taking approximately forever.
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+ version wars
+
=== Safari-152 ===
2004-07-14 Maciej Stachowiak <mjs at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 4733c62..5956b04 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -481,7 +481,6 @@
45E12D7506A49A6C00E9DF84,
);
buildSettings = {
- OPTIMIZATION_CFLAGS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
@@ -510,7 +509,6 @@
buildPhases = (
);
buildSettings = {
- OPTIMIZATION_CFLAGS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
diff --git a/JavaScriptCore/kjs/array_object.cpp b/JavaScriptCore/kjs/array_object.cpp
index 562ae4b..a684427 100644
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/array_object.cpp
@@ -580,14 +580,17 @@ Value ArrayProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args
// We return a new array
Object resObj = Object::dynamicCast(exec->lexicalInterpreter()->builtinArray().construct(exec,List::empty()));
result = resObj;
- double begin = args[0].toInteger(exec);
- if (begin < 0) {
- begin += length;
- if (begin < 0)
- begin = 0;
- } else {
- if (begin > length)
- begin = length;
+ double begin = 0;
+ if (args[0].type() != UndefinedType) {
+ begin = args[0].toInteger(exec);
+ if (begin < 0) {
+ begin += length;
+ if (begin < 0)
+ begin = 0;
+ } else {
+ if (begin > length)
+ begin = length;
+ }
}
double end = length;
if (args[1].type() != UndefinedType) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list