Title: [152856] branches/safari-537-branch/Source/_javascript_Core

Diff

Modified: branches/safari-537-branch/Source/_javascript_Core/API/JSStringRef.cpp (152855 => 152856)


--- branches/safari-537-branch/Source/_javascript_Core/API/JSStringRef.cpp	2013-07-18 18:34:59 UTC (rev 152855)
+++ branches/safari-537-branch/Source/_javascript_Core/API/JSStringRef.cpp	2013-07-18 18:36:30 UTC (rev 152856)
@@ -56,7 +56,6 @@
         }
     }
 
-    // Null string.
     return OpaqueJSString::create().leakRef();
 }
 

Modified: branches/safari-537-branch/Source/_javascript_Core/API/JSStringRefCF.cpp (152855 => 152856)


--- branches/safari-537-branch/Source/_javascript_Core/API/JSStringRefCF.cpp	2013-07-18 18:34:59 UTC (rev 152855)
+++ branches/safari-537-branch/Source/_javascript_Core/API/JSStringRefCF.cpp	2013-07-18 18:36:30 UTC (rev 152856)
@@ -53,7 +53,7 @@
         return OpaqueJSString::create(reinterpret_cast<UChar*>(buffer.get()), length).leakRef();
     }
     
-    return OpaqueJSString::create(static_cast<const LChar*>(0), 0).leakRef();
+    return OpaqueJSString::create(reinterpret_cast<const LChar*>(""), 0).leakRef();
 }
 
 CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string)

Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (152855 => 152856)


--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-18 18:34:59 UTC (rev 152855)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-18 18:36:30 UTC (rev 152856)
@@ -1,3 +1,22 @@
+2013-07-18  Lucas Forschler  <[email protected]>
+
+        Merge r152807
+
+    2013-07-17  Geoffrey Garen  <[email protected]>
+
+            JSStringCreateWithCFString should not convert the empty string into the NULL string
+            https://bugs.webkit.org/show_bug.cgi?id=118816
+
+            Reviewed by Sam Weinig.
+
+            * API/JSStringRef.cpp:
+            (JSStringCreateWithUTF8CString): Removed an extraneous comment, which
+            a previous version of the patch made incorrect.
+
+            * API/JSStringRefCF.cpp:
+            (JSStringCreateWithCFString): Don't convert the empty string into the
+            null string.
+
 2013-07-17  Lucas Forschler  <[email protected]>
 
         Rollout r152600
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to