Changeset 25078 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Aug 14, 2007, 3:19:04 PM (18 years ago)

Author:

darin

Message:

Reviewed by Sam.

• fix <rdar://problem/5410570> Global initializer introduced by use of std::numeric_limits in r24919

• kjs/ustring.cpp: (KJS::overflowIndicator): Turned into a function. (KJS::maxUChars): Ditto. (KJS::allocChars): Use the functions. (KJS::reallocChars): Ditto. (KJS::UString::expandedSize): Ditto.

File:

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

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -55 +55 @@
 extern const double Inf;
 
-static const size_t overflowIndicator = std::numeric_limits<size_t>::max();
-static const size_t maxUChars = std::numeric_limits<size_t>::max() / sizeof(UChar);
+static inline const size_t overflowIndicator() { return std::numeric_limits<size_t>::max(); }
+static inline const size_t maxUChars() { return std::numeric_limits<size_t>::max() / sizeof(UChar); }
 
 static inline UChar* allocChars(size_t length)
 {
     ASSERT(length);
-    if (length > maxUChars)
+    if (length > maxUChars())
         return 0;
     return static_cast<UChar*>(fastMalloc(sizeof(UChar) * length));
@@ -69 +69 @@
 {
     ASSERT(length);
-    if (length > maxUChars)
+    if (length > maxUChars())
         return 0;
     return static_cast<UChar*>(fastRealloc(buffer, sizeof(UChar) * length));
@@ -351 +351 @@
     // we overflow the maximum value that we can handle.
 
-    if (size > maxUChars)
-        return overflowIndicator;
+    if (size > maxUChars())
+        return overflowIndicator();
 
     size_t expandedSize = ((size + 10) / 10 * 11) + 1;
-    if (maxUChars - expandedSize < otherSize)
-        return overflowIndicator;
+    if (maxUChars() - expandedSize < otherSize)
+        return overflowIndicator();
 
     return expandedSize + otherSize;