Changeset 6025 in webkit for trunk/JavaScriptCore/kjs/value.cpp

Timestamp:

Feb 2, 2004, 1:23:17 PM (21 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• fixed <rdar://problem/3519285>: integer operations on large negative numbers yield bad results (discovered with "HTMLCrypt")
• fixed other related overflow issues

• kjs/value.h: Changed return types of toInteger, toInt32, toUInt32, and toUInt16.
• kjs/value.cpp: (ValueImp::toInteger): Change to return a double, since this operation, from the ECMA specification, must not restrict values to the range of a particular integer type. (ValueImp::toInt32): Used a sized integer type for the result of this function, and also added proper handling for negative results from fmod. (ValueImp::toUInt32): Ditto. (ValueImp::toUInt16): Ditto. (ValueImp::dispatchToUInt32): Changed result type from unsigned to uint32_t.

• kjs/array_object.cpp: (ArrayProtoFuncImp::call): Use a double instead of an int to handle out-of-integer-range values better in the slice function.
• kjs/internal.cpp: (KJS::roundValue): Streamline the function, handling NAN and infinity properly.
• kjs/number_object.cpp: (NumberProtoFuncImp::call): Use a double instead of an int to handle out-of-integer-range values better in the toString function.
• kjs/string_object.cpp: (StringProtoFuncImp::call): Use a double instead of an int to handle out-of-integer-range values better in the charAt, charCodeAt, indexOf, lastIndexOf, slice, and substr functions.

File:

• trunk/JavaScriptCore/kjs/value.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/value.cpp

@@ -94 +94 @@
 
 // ECMA 9.4
-int ValueImp::toInteger(ExecState *exec) const
-{
-  unsigned i;
+double ValueImp::toInteger(ExecState *exec) const
+{
+  uint32_t i;
   if (dispatchToUInt32(i))
-    return (int)i;
-  return int(roundValue(exec, Value(const_cast<ValueImp*>(this))));
-}
-
-int ValueImp::toInt32(ExecState *exec) const
-{
-  unsigned i;
+    return i;
+  return roundValue(exec, Value(const_cast<ValueImp*>(this)));
+}
+
+int32_t ValueImp::toInt32(ExecState *exec) const
+{
+  uint32_t i;
   if (dispatchToUInt32(i))
-    return (int)i;
+    return i;
 
   double d = roundValue(exec, Value(const_cast<ValueImp*>(this)));
+  if (isNaN(d) || isInf(d))
+    return 0;
   double d32 = fmod(d, D32);
 
   if (d32 >= D32 / 2.0)
     d32 -= D32;
-
-  return static_cast<int>(d32);
-}
-
-unsigned int ValueImp::toUInt32(ExecState *exec) const
-{
-  unsigned i;
+  else if (d32 < -D32 / 2.0)
+    d32 += D32;
+
+  return static_cast<int32_t>(d32);
+}
+
+uint32_t ValueImp::toUInt32(ExecState *exec) const
+{
+  uint32_t i;
   if (dispatchToUInt32(i))
     return i;
 
   double d = roundValue(exec, Value(const_cast<ValueImp*>(this)));
+  if (isNaN(d) || isInf(d))
+    return 0;
   double d32 = fmod(d, D32);
 
-  return static_cast<unsigned int>(d32);
-}
-
-unsigned short ValueImp::toUInt16(ExecState *exec) const
-{
-  unsigned i;
+  if (d32 < 0)
+    d32 += D32;
+
+  return static_cast<uint32_t>(d32);
+}
+
+uint16_t ValueImp::toUInt16(ExecState *exec) const
+{
+  uint32_t i;
   if (dispatchToUInt32(i))
-    return (unsigned short)i;
+    return i;
 
   double d = roundValue(exec, Value(const_cast<ValueImp*>(this)));
+  if (isNaN(d) || isInf(d))
+    return 0;
   double d16 = fmod(d, D16);
 
-  return static_cast<unsigned short>(d16);
+  if (d16 < 0)
+    d16 += D16;
+
+  return static_cast<uint16_t>(d16);
 }
 
@@ -186 +200 @@
 }
 
-bool ValueImp::dispatchToUInt32(unsigned& result) const
+bool ValueImp::dispatchToUInt32(uint32_t& result) const
 {
   if (SimpleNumber::is(this)) {
@@ -192 +206 @@
     if (i < 0)
       return false;
-    result = (unsigned)i;
+    result = i;
     return true;
   }