[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[oliver at apple.com]

The following commit has been merged in the debian/experimental branch:
commit fc7171b328d5bb1b3d5bace68cc3af4a64a69027
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 18:33:49 2010 +0000

    Crash when trying to enable JIT and Interpreter in a single build.
    
    Reviewed by Don Melton.
    
    CFPreferences code added at the last minute failed to account for
    the preference not being present and then attempted to CFRelease
    a null value.
    
    * runtime/JSGlobalData.cpp:
    (JSC::JSGlobalData::JSGlobalData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63336 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4361735..671f2c9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-14  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Don Melton.
+
+        Crash when trying to enable JIT and Interpreter in a single build.
+
+        CFPreferences code added at the last minute failed to account for
+        the preference not being present and then attempted to CFRelease
+        a null value.
+
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::JSGlobalData):
+
 2010-07-14  Zoltan Herczeg  <zherczeg at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/runtime/JSGlobalData.cpp b/JavaScriptCore/runtime/JSGlobalData.cpp
index b23606e..3a40a92 100644
--- a/JavaScriptCore/runtime/JSGlobalData.cpp
+++ b/JavaScriptCore/runtime/JSGlobalData.cpp
@@ -160,8 +160,11 @@ JSGlobalData::JSGlobalData(GlobalDataType globalDataType, ThreadStackType thread
 #if PLATFORM(MAC)
     CFStringRef canUseJITKey = CFStringCreateWithCString(0 , "JavaScriptCoreUseJIT", kCFStringEncodingMacRoman);
     CFBooleanRef canUseJIT = (CFBooleanRef)CFPreferencesCopyAppValue(canUseJITKey, kCFPreferencesCurrentApplication);
-    m_canUseJIT = kCFBooleanTrue == canUseJIT;
-    CFRelease(canUseJIT);
+    if (canUseJIT) {
+        m_canUseJIT = kCFBooleanTrue == canUseJIT;
+        CFRelease(canUseJIT);
+    } else
+        m_canUseJIT = !getenv("JSC_FORCE_INTERPRETER");
     CFRelease(canUseJITKey);
 #elif OS(UNIX)
     m_canUseJIT = !getenv("JSC_FORCE_INTERPRETER");

-- 
WebKit Debian packaging