Changeset 69129 in webkit

Timestamp:

Oct 5, 2010 11:36:23 AM (14 years ago)

Author:

andersca@apple.com

Message:

REGRESSION (r68966?): All dumpAsText test fail on WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=47188
<rdar://problem/8514104>

Reviewed by Sam Weinig.

When constructing the std::string, use the real string length instead of the maximum buffer size.

• TestWebKitAPI/PlatformUtilities.h:

(TestWebKitAPI::Util::toSTD):

• WebKitTestRunner/StringFunctions.h:

(WTR::toSTD):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/PlatformUtilities.h (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit2/WKString.cpp (modified) (1 diff)
• WebKitTestRunner/StringFunctions.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        REGRESSION (r68966?): All dumpAsText test fail on WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=47188
+        <rdar://problem/8514104>
+
+        When constructing the std::string, use the real string length instead of the maximum buffer size.
+
+        * TestWebKitAPI/PlatformUtilities.h:
+        (TestWebKitAPI::Util::toSTD):
+        * WebKitTestRunner/StringFunctions.h:
+        (WTR::toSTD):
+
 2010-10-04  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/TestWebKitAPI/PlatformUtilities.h

@@ -44 +44 @@
     size_t bufferSize = WKStringGetMaximumUTF8CStringSize(string);
     OwnArrayPtr<char> buffer = adoptArrayPtr(new char[bufferSize]);
-    WKStringGetUTF8CString(string, buffer.get(), bufferSize);
-
-    return std::string(buffer.get(), bufferSize);
+    size_t stringLength = WKStringGetUTF8CString(string, buffer.get(), bufferSize);
+    return std::string(buffer.get(), stringLength - 1);
 }
 

trunk/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKString.cpp

@@ -39 +39 @@
 
     size_t maxSize = WKStringGetMaximumUTF8CStringSize(string);
-    char* buffer = (char*)malloc(maxSize);
-    
+    char* buffer = new char[maxSize];
+
     size_t actualSize = WKStringGetUTF8CString(string, buffer, maxSize);
     TEST_ASSERT(actualSize == 6);
     TEST_ASSERT(strcmp(buffer, "hello") == 0);
 
-    free(buffer);
+    delete[] buffer;
     
     WKRelease(string);

trunk/WebKitTools/WebKitTestRunner/StringFunctions.h

@@ -71 +71 @@
     size_t bufferSize = WKStringGetMaximumUTF8CStringSize(string);
     OwnArrayPtr<char> buffer = adoptArrayPtr(new char[bufferSize]);
-    WKStringGetUTF8CString(string, buffer.get(), bufferSize);
-
-    return std::string(buffer.get(), bufferSize);
+    size_t stringLength = WKStringGetUTF8CString(string, buffer.get(), bufferSize);
+    return std::string(buffer.get(), stringLength - 1);
 }