Changeset 170513 in webkit

Timestamp:

Jun 26, 2014, 6:10:48 PM (11 years ago)

Author:

ddkilzer@apple.com

Message:

[Win] Always NULL-terminate the string in createUTF8String()
<​http://webkit.org/b/134353>
<rdar://problem/17471783>

Reviewed by Brent Fulgham.

• plugins/PluginView.cpp:

(WebCore::createUTF8String): Pull out CString length into local
variable. Switch to use memcpy. Always NULL-terminate the
string.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-26  David Kilzer  <ddkilzer@apple.com>
+
+        [Win] Always NULL-terminate the string in createUTF8String()
+        <http://webkit.org/b/134353>
+        <rdar://problem/17471783>
+
+        Reviewed by Brent Fulgham.
+
+        * plugins/PluginView.cpp:
+        (WebCore::createUTF8String): Pull out CString length into local
+        variable.  Switch to use memcpy.  Always NULL-terminate the
+        string.
+
 2014-06-26  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/plugins/PluginView.cpp

@@ -410 +410 @@
 {
     CString cstr = str.utf8();
-    char* result = reinterpret_cast<char*>(fastMalloc(cstr.length() + 1));
-
-    strncpy(result, cstr.data(), cstr.length() + 1);
+    const size_t cstrLength = cstr.length();
+    char* result = reinterpret_cast<char*>(fastMalloc(cstrLength + 1));
+
+    memcpy(result, cstr.data(), cstrLength);
+    result[cstrLength] = '\0';
 
     return result;