Title: [133179] trunk/Tools
- Revision
- 133179
- Author
- aro...@webkit.org
- Date
- 2012-11-01 08:40:31 -0700 (Thu, 01 Nov 2012)
Log Message
Crash beneath WKRelease after failed load in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=100954
Reviewed by Sam Weinig.
There were just some simple retain/release bugs.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController updateTextFieldFromURL:]):
(-[WK2BrowserWindowController updateProvisionalURLForFrame:]):
Don't try to release null URLs.
(-[WK2BrowserWindowController updateCommittedURLForFrame:]): Don't
release a URL for which we don't have ownership.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (133178 => 133179)
--- trunk/Tools/ChangeLog 2012-11-01 15:33:29 UTC (rev 133178)
+++ trunk/Tools/ChangeLog 2012-11-01 15:40:31 UTC (rev 133179)
@@ -1,3 +1,20 @@
+2012-11-01 Adam Roben <aro...@webkit.org>
+
+ Crash beneath WKRelease after failed load in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=100954
+
+ Reviewed by Sam Weinig.
+
+ There were just some simple retain/release bugs.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController updateTextFieldFromURL:]):
+ (-[WK2BrowserWindowController updateProvisionalURLForFrame:]):
+ Don't try to release null URLs.
+
+ (-[WK2BrowserWindowController updateCommittedURLForFrame:]): Don't
+ release a URL for which we don't have ownership.
+
2012-10-31 Rob Buis <rb...@rim.com>
[BlackBerry] Fix editing/text-iterator/findString-expected.html fail
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (133178 => 133179)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2012-11-01 15:33:29 UTC (rev 133178)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2012-11-01 15:40:31 UTC (rev 133179)
@@ -733,10 +733,8 @@
if (!emptyURL)
emptyURL = WKURLCreateWithUTF8CString("");
- if (WKURLIsEqual(URLRef, emptyURL)) {
- WKRelease(URLRef);
+ if (WKURLIsEqual(URLRef, emptyURL))
return;
- }
CFURLRef cfSourceURL = WKURLCopyCFURL(0, URLRef);
[urlText setStringValue:(NSString*)CFURLGetString(cfSourceURL)];
@@ -746,6 +744,8 @@
- (void)updateProvisionalURLForFrame:(WKFrameRef)frame
{
WKURLRef url = ""
+ if (!url)
+ return;
[self updateTextFieldFromURL:url];
WKRelease(url);
}
@@ -753,6 +753,8 @@
- (void)updateCommittedURLForFrame:(WKFrameRef)frame
{
WKURLRef url = ""
+ if (!url)
+ return;
[self updateTextFieldFromURL:url];
WKRelease(url);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
