Changeset 25527 in webkit for trunk/JavaScriptCore/API/JSStringRefCF.cpp

Timestamp:

Sep 12, 2007, 7:16:50 PM (18 years ago)

Author:

weinig

Message:

Reviewed by Geoffrey Garen.

<rdar://problem/5478717> JSStringCreateWithCFString leaks when passed a zero length CFStringRef

• API/JSStringRefCF.cpp: (JSStringCreateWithCFString): Special case the zero length string and remove the UTF16 optimized path since it will always leak due to the fact that we won't be able to free the backing store that the CFStringRef provides.

File:

• trunk/JavaScriptCore/API/JSStringRefCF.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSStringRefCF.cpp

@@ -40 +40 @@
     JSLock lock;
     CFIndex length = CFStringGetLength(string);
-    
-    // Optimized path for when CFString backing store is a UTF16 buffer
-    if (const UniChar* buffer = CFStringGetCharactersPtr(string)) {
-        UString::Rep* rep = UString(reinterpret_cast<const UChar*>(buffer), length).rep()->ref();
-        return toRef(rep);
+    UString::Rep* rep;
+    if (!length)
+        rep = UString("").rep()->ref();
+    else {
+        UniChar* buffer = static_cast<UniChar*>(fastMalloc(sizeof(UniChar) * length));
+        CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
+        rep = UString(reinterpret_cast<UChar*>(buffer), length, false).rep()->ref();
     }
-
-    UniChar* buffer = static_cast<UniChar*>(fastMalloc(sizeof(UniChar) * length));
-    CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
-    UString::Rep* rep = UString(reinterpret_cast<UChar*>(buffer), length, false).rep()->ref();
     return toRef(rep);
 }