Changeset 30119 in webkit

Timestamp:

Feb 9, 2008 11:00:06 PM (16 years ago)

Author:

Darin Adler

Message:

Reviewed by Tim Hatcher.

• fix <rdar://problem/5725996> crash every time you open the Xcode documentation window

• WebView/WebView.mm: (-[WebView _userAgentWithApplicationName:andWebKitVersion:]): Work around a bug in the garbage collector's Objective C++ support by not initializing a static to an object that needs to be marked when running under GC.

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2008-02-09  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        - fix <rdar://problem/5725996> crash every time you open the Xcode documentation window
+
+        * WebView/WebView.mm:
+        (-[WebView _userAgentWithApplicationName:andWebKitVersion:]): Work around a bug in the
+        garbage collector's Objective C++ support by not initializing a static to an object
+        that needs to be marked when running under GC.
+
 2008-02-05  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKit/mac/WebView/WebView.mm

@@ -4104 +4104 @@
 - (NSString *)_userAgentWithApplicationName:(NSString *)applicationName andWebKitVersion:(NSString *)version
 {
-    static NSString *osVersion = createMacOSXVersionString();
+    // Note: Do *not* move the initialization of osVersion into the declaration.
+    // Garbage collection won't correctly mark the global variable in that case <rdar://problem/5733674>.
+    static NSString *osVersion;
+    if (!osVersion)
+        version = createMacOSXVersionString();
     NSString *language = [NSUserDefaults _webkit_preferredLanguageCode];
     if ([applicationName length])