Changeset 109497 in webkit

Timestamp:

Mar 1, 2012 8:54:18 PM (12 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/10942540> REGRESSION (r108956): Safari Webpage Preview Fetcher crashes in WebCore::localizedString() when using a WebKit nightly build
​https://bugs.webkit.org/show_bug.cgi?id=80034

Reviewed by Benjamin Poulain.

Safari Webpage Preview Fetcher can’t access the WebCore framework when launched from a WebKit
nightly build. After r108956, this causes it to crash.

• platform/mac/LocalizedStringsMac.cpp:

(WebCore::localizedString): Added a null-check for the value returned from
CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebCore")).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/LocalizedStringsMac.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10942540> REGRESSION (r108956): Safari Webpage Preview Fetcher crashes in WebCore::localizedString() when using a WebKit nightly build
+        https://bugs.webkit.org/show_bug.cgi?id=80034
+
+        Reviewed by Benjamin Poulain.
+
+        Safari Webpage Preview Fetcher can’t access the WebCore framework when launched from a WebKit
+        nightly build. After r108956, this causes it to crash.
+
+        * platform/mac/LocalizedStringsMac.cpp:
+        (WebCore::localizedString): Added a null-check for the value returned from
+        CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebCore")).
+
 2012-03-01  Jason Liu  <jason.liu@torchmobile.com.cn>
 

trunk/Source/WebCore/platform/mac/LocalizedStringsMac.cpp

@@ -47 +47 @@
     RetainPtr<CFStringRef> keyString(AdoptCF, CFStringCreateWithCStringNoCopy(0, key, kCFStringEncodingUTF8, kCFAllocatorNull));
     CFStringRef notFound = CFSTR("localized string not found");
-    RetainPtr<CFStringRef> result(AdoptCF, CFBundleCopyLocalizedString(bundle, keyString.get(), notFound, 0));
+    RetainPtr<CFStringRef> result;
+    if (bundle) {
+        result.adoptCF(CFBundleCopyLocalizedString(bundle, keyString.get(), notFound, 0));
+        ASSERT_WITH_MESSAGE(result.get() != notFound, "could not find localizable string %s in bundle", key);
+    } else
+        result = notFound;
 
-    ASSERT_WITH_MESSAGE(result.get() != notFound, "could not find localizable string %s in bundle", key);
     return String(result.get());
 }