Changeset 24875 in webkit

Timestamp:

Aug 5, 2007, 3:52:19 AM (18 years ago)

Author:

mjs

Message:

Reviewed by Darin Adler.

<rdar://problem/5369110> CrashTracer: [USER] reproducible crash opening particular mail messages

• platform/network/mac/ResourceHandleMac.mm: (-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]): Make sure to retain self for the body of this method. Otherwise, the willSendRequest could trigger events which will cancel the connection, and we access ivars after this point. (-[WebCoreSynchronousLoader connection:willSendRequest:redirectResponse:]): retain and release in the right order.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/ResourceHandleMac.mm (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-05  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin Adler.
+        
+        <rdar://problem/5369110> CrashTracer: [USER] reproducible crash opening particular mail messages
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]): Make sure to retain
+        self for the body of this method. Otherwise, the willSendRequest could trigger events which will
+        cancel the connection, and we access ivars after this point.
+        (-[WebCoreSynchronousLoader connection:willSendRequest:redirectResponse:]): retain and release
+        in the right order.
+
 2007-08-04  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -346 +346 @@
 - (NSURLRequest *)connection:(NSURLConnection *)con willSendRequest:(NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse
 {
+    // the willSendRequest call may cancel this load, in which case self could be deallocated
+    RetainPtr<WebCoreResourceHandleAsDelegate> protect(self);
+
     if (!m_handle || !m_handle->client())
         return nil;
@@ -353 +356 @@
     --inNSURLConnectionCallback;
 #ifndef BUILDING_ON_TIGER
+    NSURL *copy = [[request.nsURLRequest() URL] copy];
     [m_url release];
-    m_url = [[request.nsURLRequest() URL] copy];    
+    m_url = copy;
 #endif
     
@@ -515 +519 @@
 - (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse
 {
+    NSURL *copy = [[newRequest URL] copy];
     [m_url release];
-    m_url = [[newRequest URL] copy];
+    m_url = copy;
 
     return newRequest;