Changeset 120663 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

Timestamp:

Jun 18, 2012, 8:32:30 PM (13 years ago)

Author:

[email protected]

Message:

[JSC] In JSGlobalData.cpp, enableAssembler() sometimes leaks two CF objects
​https://bugs.webkit.org/show_bug.cgi?id=89415

Reviewed by Sam Weinig.

In the case where canUseJIT was a non-NULL CFBooleanRef,
enableAssembler() would leak both canUseJITKey and canUseJIT by
returning before calling CFRelease. Fix this by using RetainPtr.

• runtime/JSGlobalData.cpp:

(JSC::enableAssembler):

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -55 +55 @@
 #include "StrictEvalActivation.h"
 #include "StrongInlines.h"
+#include <wtf/RetainPtr.h>
 #include <wtf/Threading.h>
 #include <wtf/WTFThreadData.h>
@@ -101 +102 @@
 
 #if USE(CF)
-    CFStringRef canUseJITKey = CFStringCreateWithCString(0 , "JavaScriptCoreUseJIT", kCFStringEncodingMacRoman);
-    CFBooleanRef canUseJIT = (CFBooleanRef)CFPreferencesCopyAppValue(canUseJITKey, kCFPreferencesCurrentApplication);
-    if (canUseJIT) {
+    RetainPtr<CFStringRef> canUseJITKey(AdoptCF, CFStringCreateWithCString(0 , "JavaScriptCoreUseJIT", kCFStringEncodingMacRoman));
+    RetainPtr<CFBooleanRef> canUseJIT(AdoptCF, (CFBooleanRef)CFPreferencesCopyAppValue(canUseJITKey.get(), kCFPreferencesCurrentApplication));
+    if (canUseJIT)
         return kCFBooleanTrue == canUseJIT;
-        CFRelease(canUseJIT);
-    }
-    CFRelease(canUseJITKey);
 #endif