JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / wtf / StringExtras.h

diff --git a/wtf/StringExtras.h b/wtf/StringExtras.h
index b1ec09f095ce570de85cd5f1b40aa6d1b7334fef..371e33bf98ad055c2e233a50ec1fc1c524c7d92c 100644 (file)
--- a/wtf/StringExtras.h
+++ b/wtf/StringExtras.h
@@ -1,5 +1,5 @@
 /*
 /*

- * 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
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -28,6 +28,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>

+#include <string.h>

 
 #if HAVE(STRINGS_H) 
 #include <strings.h> 
 
 #if HAVE(STRINGS_H) 
 #include <strings.h> 


@@ -43,17 +44,30 @@ inline int snprintf(char* buffer, size_t count, const char* format, ...)
     va_start(args, format);
     result = _vsnprintf(buffer, count, format, args);
     va_end(args);
     va_start(args, format);
     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;
 }
 
     return result;
 }
 

-#if COMPILER(MSVC7) || OS(WINCE)
-
-inline int vsnprintf(char* buffer, size_t count, const char* format, va_list args)
+inline double wtf_vsnprintf(char* buffer, size_t count, const char* format, va_list args)

 {
 {

-    return _vsnprintf(buffer, count, format, args);
+    int result = _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 difference in Microsoft's implementation of vsnprintf, where 
+// vsnprintf does not null terminate the buffer. WebKit can rely on the null termination.
+#define vsnprintf(buffer, count, format, args) wtf_vsnprintf(buffer, count, format, args)

 
 #if OS(WINCE)
 
 
 #if OS(WINCE)
 


@@ -86,8 +100,7 @@ inline int strcasecmp(const char* s1, const char* s2)
 
 #endif
 
 
 #endif
 

-#if OS(WINDOWS) || OS(LINUX) || OS(SOLARIS)
-// FIXME: should check HAVE_STRNSTR
+#if !HAVE(STRNSTR)

 
 inline char* strnstr(const char* buffer, const char* target, size_t bufferLength)
 {
 
 inline char* strnstr(const char* buffer, const char* target, size_t bufferLength)
 {