Changeset 140442 in webkit

Timestamp:

Jan 22, 2013, 11:13:58 AM (14 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION(r140344): Repeated crashes in WKTR PlatformWebView::viewSupportsOptions().
​https://bugs.webkit.org/show_bug.cgi?id=107562

Rubber-stamped by Alexy Proskuryakov.

The input to WKBooleanGetValue() is not NULL-safe, so NULL check its inputs before calling.

• WebKitTestRunner/mac/PlatformWebViewMac.mm:

(WTR::PlatformWebView::PlatformWebView):
(WTR::PlatformWebView::viewSupportsOptions):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/mac/PlatformWebViewMac.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-22  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION(r140344): Repeated crashes in WKTR PlatformWebView::viewSupportsOptions().
+        https://bugs.webkit.org/show_bug.cgi?id=107562
+
+        Rubber-stamped by Alexy Proskuryakov.
+
+        The input to WKBooleanGetValue() is not NULL-safe, so NULL check its inputs before calling.
+
+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+        (WTR::PlatformWebView::PlatformWebView):
+        (WTR::PlatformWebView::viewSupportsOptions):
+
 2013-01-22  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm

@@ -110 +110 @@
 {
     WKRetainPtr<WKStringRef> useTiledDrawingKey(AdoptWK, WKStringCreateWithUTF8CString("TiledDrawing"));
-    bool useTiledDrawing = options ? WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useTiledDrawingKey.get()))) : false;
+    WKTypeRef useTiledDrawingValue = options ? WKDictionaryGetItemForKey(options, useTiledDrawingKey.get()) : NULL;
+    bool useTiledDrawing = useTiledDrawingValue && WKBooleanGetValue(static_cast<WKBooleanRef>(useTiledDrawingValue));
 
     NSRect rect = NSMakeRect(0, 0, 800, 600);
@@ -203 +204 @@
 {
     WKRetainPtr<WKStringRef> useTiledDrawingKey(AdoptWK, WKStringCreateWithUTF8CString("TiledDrawing"));
-    bool useTiledDrawing = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useTiledDrawingKey.get())));
+    WKTypeRef useTiledDrawingValue = WKDictionaryGetItemForKey(options, useTiledDrawingKey.get());
+    bool useTiledDrawing = useTiledDrawingValue && WKBooleanGetValue(static_cast<WKBooleanRef>(useTiledDrawingValue));
 
     return useTiledDrawing == [(TestRunnerWKView *)m_view useTiledDrawing];