Title: [101256] trunk/Source/WebKit/mac
- Revision
- 101256
- Author
- [email protected]
- Date
- 2011-11-28 06:37:59 -0800 (Mon, 28 Nov 2011)
Log Message
Properly retain the OS X version string
Fixes <http://webkit.org/b/73214> REGRESSION (r101215): Crash on launch beneath +[WebView
_standardUserAgentWithApplicationName:]
Reviewed by Antti Koivisto.
* WebView/WebView.mm:
(createMacOSXVersionString): Retain the string we're returning, since this function is
supposed to return an owning reference to the caller.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (101255 => 101256)
--- trunk/Source/WebKit/mac/ChangeLog 2011-11-28 13:53:31 UTC (rev 101255)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-11-28 14:37:59 UTC (rev 101256)
@@ -1,3 +1,16 @@
+2011-11-28 Adam Roben <[email protected]>
+
+ Properly retain the OS X version string
+
+ Fixes <http://webkit.org/b/73214> REGRESSION (r101215): Crash on launch beneath +[WebView
+ _standardUserAgentWithApplicationName:]
+
+ Reviewed by Antti Koivisto.
+
+ * WebView/WebView.mm:
+ (createMacOSXVersionString): Retain the string we're returning, since this function is
+ supposed to return an owning reference to the caller.
+
2011-11-28 Hayato Ito <[email protected]>
Fix chromium canary build after r101215.
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (101255 => 101256)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-11-28 13:53:31 UTC (rev 101255)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-11-28 14:37:59 UTC (rev 101256)
@@ -513,7 +513,7 @@
// Use underscores instead of dots because when we first added the Mac OS X version to the user agent string
// we were concerned about old DHTML libraries interpreting "4." as Netscape 4. That's no longer a concern for us
// but we're sticking with the underscores for compatibility with the format used by older versions of Safari.
- return [WKGetMacOSXVersionString() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
+ return [[WKGetMacOSXVersionString() stringByReplacingOccurrencesOfString:@"." withString:@"_"] retain];
}
#else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
