Changeset 62457 in webkit for trunk/JavaScriptCore/wtf/StringExtras.h

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/wtf/StringExtras.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/StringExtras.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45 +45 @@
     result = _vsnprintf(buffer, count, format, args);
     va_end(args);
+
+    // In the case where the string entirely filled the buffer, _vsnprintf will not
+    // null-terminate it, but snprintf must.
+    if (count > 0)
+        buffer[count - 1] = '\0';
+
     return result;
 }
 
-#if COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
+inline double wtf_vsnprintf(char* buffer, size_t count, const char* format, va_list args)
+{
+    int result = _vsnprintf(buffer, count, format, args);
 
-inline int vsnprintf(char* buffer, size_t count, const char* format, va_list args)
-{
-    return _vsnprintf(buffer, count, format, args);
+    // In the case where the string entirely filled the buffer, _vsnprintf will not
+    // null-terminate it, but vsnprintf must.
+    if (count > 0)
+        buffer[count - 1] = '\0';
+
+    return result;
 }
 
-#endif
+// Work around a bug in Microsoft's implementation of vsnprintf, where 
+// vsnprintf does not null terminate the buffer
+#define vsnprintf(buffer, count, format, args) wtf_vsnprintf(buffer, count, format, args)
 
 #if OS(WINCE)