Changeset 62457 in webkit for trunk/JavaScriptCore/runtime/UString.cpp

Timestamp:

Jul 3, 2010, 5:11:41 PM (15 years ago)

Author:

[email protected]

Message:

Patch for ​https://bugs.webkit.org/show_bug.cgi?id=41553
Make StringExtras.h versions of snprintf and vsnprintf match the unix versions.

Reviewed by Darin Adler.

• MSVC does not ensure the buffers are null terminated as the unix versions do.

• runtime/JSGlobalObjectFunctions.cpp: Cleanup includes.
• runtime/UString.cpp: Clean up includes.

(JSC::UString::from): Don't pass sizeof(buf) - 1, that is wrong.

• wtf/StringExtras.h:

(snprintf): Ensure null termination of buffer.
(vsnprintf): Ditto.

File:

• trunk/JavaScriptCore/runtime/UString.cpp (modified) (3 diffs)

trunk/JavaScriptCore/runtime/UString.cpp

@@ -33 +33 @@
 #include <limits.h>
 #include <limits>
-#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
@@ -43 +41 @@
 #include <wtf/Vector.h>
 #include <wtf/unicode/UTF8.h>
-#include <wtf/StringExtras.h>
 
 #if HAVE(STRINGS_H)
@@ -127 +124 @@
         char minBuf[1 + sizeof(i) * 3];
 #if OS(WINDOWS)
-        snprintf(minBuf, sizeof(minBuf) - 1, "%I64d", std::numeric_limits<long long>::min());
+        snprintf(minBuf, sizeof(minBuf), "%I64d", std::numeric_limits<long long>::min());
 #else
-        snprintf(minBuf, sizeof(minBuf) - 1, "%lld", std::numeric_limits<long long>::min());
+        snprintf(minBuf, sizeof(minBuf), "%lld", std::numeric_limits<long long>::min());
 #endif
         return UString(minBuf);