Title: [151752] trunk/Source/WebKit/win
Revision
151752
Author
[email protected]
Date
2013-06-19 13:51:36 -0700 (Wed, 19 Jun 2013)

Log Message

[Windows] Unreviewed build correction.

* WebCoreSupport/WebFrameNetworkingContext.cpp:
(WebFrameNetworkingContext::ensurePrivateBrowsingSession): Make sure returned generic
type is a CFStringRef before casting.

Modified Paths

Diff

Modified: trunk/Source/WebKit/win/ChangeLog (151751 => 151752)


--- trunk/Source/WebKit/win/ChangeLog	2013-06-19 20:37:40 UTC (rev 151751)
+++ trunk/Source/WebKit/win/ChangeLog	2013-06-19 20:51:36 UTC (rev 151752)
@@ -1,3 +1,11 @@
+2013-06-19  Brent Fulgham  <[email protected]>
+
+        [Windows] Unreviewed build correction.
+
+        * WebCoreSupport/WebFrameNetworkingContext.cpp:
+        (WebFrameNetworkingContext::ensurePrivateBrowsingSession): Make sure returned generic
+        type is a CFStringRef before casting.
+
 2013-06-19  Roger Fong  <[email protected]>
 
         Unreviewed build fix for Apple Windows port.

Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp (151751 => 151752)


--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp	2013-06-19 20:37:40 UTC (rev 151751)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp	2013-06-19 20:51:36 UTC (rev 151752)
@@ -74,7 +74,11 @@
 
     String base;
     if (!identifierBase)
-        base = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleIdentifierKey);
+    {
+        if (CFTypeRef bundleValue = CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleIdentifierKey))
+            if (CFGetTypeID(bundleValue) == CFStringGetTypeID())
+                base = reinterpret_cast<CFStringRef>(bundleValue);
+    }
     else
         base = *identifierBase;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to