@@ -56,7 +56,6 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
         }
     }
 
-    // Null string.
     return OpaqueJSString::create().leakRef();
 }
 
 
@@ -53,7 +53,7 @@ JSStringRef JSStringCreateWithCFString(CFStringRef string)
         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)
 
@@ -1,3 +1,18 @@
+2013-07-17  Geoffrey Garen  <ggaren@apple.com>
+
+        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  Chris Curtis  <chris_curtis@apple.com>
 
         Naming convention on createInvalidParamError is incorrect.
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- // Null string.`
`60`	`59`	`return OpaqueJSString::create().leakRef();`
`61`	`60`	`}`
`62`	`61`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ JSStringRef JSStringCreateWithCFString(CFStringRef string)`
`53`	`53`	`return OpaqueJSString::create(reinterpret_cast<UChar*>(buffer.get()), length).leakRef();`
`54`	`54`	`}`
`55`	`55`
`56`		`- return OpaqueJSString::create(static_cast<const LChar*>(0), 0).leakRef();`
	`56`	`+ return OpaqueJSString::create(reinterpret_cast<const LChar*>(""), 0).leakRef();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string)`