[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit b9bf3b8c4e609a4b1f0bf957642336ca7843d4b4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 16 16:51:06 2002 +0000

    	- fixed 3026184 -- Hang going to http://aa.com/ while executing JavaScript
    
            * kjs/simple_number.h: (SimpleNumber::value): Fixed conversion to a negative
    	number. The technique of using division was no good. Instead, or in the sign
    	bits as needed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1846 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ca8a95e..71bbf2f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3026184 -- Hang going to http://aa.com/ while executing JavaScript
+
+        * kjs/simple_number.h: (SimpleNumber::value): Fixed conversion to a negative
+	number. The technique of using division was no good. Instead, or in the sign
+	bits as needed.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
         * kjs/reference_list.h: Must include headers with "", not
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index ca8a95e..71bbf2f 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3026184 -- Hang going to http://aa.com/ while executing JavaScript
+
+        * kjs/simple_number.h: (SimpleNumber::value): Fixed conversion to a negative
+	number. The technique of using division was no good. Instead, or in the sign
+	bits as needed.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
         * kjs/reference_list.h: Must include headers with "", not
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index ca8a95e..71bbf2f 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3026184 -- Hang going to http://aa.com/ while executing JavaScript
+
+        * kjs/simple_number.h: (SimpleNumber::value): Fixed conversion to a negative
+	number. The technique of using division was no good. Instead, or in the sign
+	bits as needed.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
         * kjs/reference_list.h: Must include headers with "", not
diff --git a/JavaScriptCore/kjs/simple_number.h b/JavaScriptCore/kjs/simple_number.h
index 766b093..9938940 100644
--- a/JavaScriptCore/kjs/simple_number.h
+++ b/JavaScriptCore/kjs/simple_number.h
@@ -34,7 +34,7 @@ namespace KJS {
 	enum { tag = 1, shift = 2, mask = (1 << shift) - 1, max = (1 << (31 - shift)) - 1, min = -max - 1 };
 
 	static inline bool is(const ValueImp *imp) { return ((int)imp & mask) == tag; }
-	static inline int value(const ValueImp *imp) { return (int)imp / (1 << shift); }
+	static inline int value(const ValueImp *imp) { return ((int)imp >> shift) | (((int)imp & min) ? ~max : 0); }
 
 	static inline bool fits(int i) { return i <= max && i >= min; }
 	static inline bool fits(unsigned i) { return i <= (unsigned)max; }

-- 
WebKit Debian packaging