Attachment 67578 Details for Bug 41510 – Patch for nil value

[patch] Patch for nil value

nilValue.patch (text/plain), 1.25 KB, created by Patrick R. Gansterer on 2010-09-14 11:27:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick R. Gansterer

Created: 2010-09-14 11:27:42 PDT

Size: 1.25 KB

patch

obsolete

>diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
>index a9e0304..b8e4944 100644
>--- a/WebKit/mac/ChangeLog
>+++ b/WebKit/mac/ChangeLog
>@@ -1,3 +1,16 @@
>+2010-09-14  Patrick Gansterer  <paroga@paroga.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Always use a valid string when setting WebKitUserStyleSheetLocationPreferenceKey.
>+        https://bugs.webkit.org/show_bug.cgi?id=41510
>+
>+        This prevents usage of nil value, which would cause an uncaught exception.
>+        A test for this will be commited in a separate patch (see bug).
>+
>+        * WebView/WebPreferences.mm:
>+        (-[WebPreferences setUserStyleSheetLocation:]):
>+
> 2010-09-14  Eric Seidel  <eric@webkit.org>
> 
>         Unreviewed, reverting changes r67451 and r67451.
>diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
>index a4a5383..44ad59b 100644
>--- a/WebKit/mac/WebView/WebPreferences.mm
>+++ b/WebKit/mac/WebView/WebPreferences.mm
>@@ -641,7 +641,10 @@ static WebCacheModel cacheModelForMainBundle(void)
>     } else {
>         locationString = [URL _web_originalDataAsString];
>     }
>-    
>+
>+    if (!locationString)
>+        locationString = @"";
>+
>     [self _setStringValue:locationString forKey: WebKitUserStyleSheetLocationPreferenceKey];
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 41510: 60348 | 60456 | 60472 | 63224 | 63238 | 63844 | 63845 | 66070 | 66276 | 66975 | 67480 | 67555 | 67566 | 67578 | 67579 | 67599 | 67826 | 69572