Title: [123444] trunk/Source/WebKit2
Revision
123444
Author
[email protected]
Date
2012-07-24 02:21:37 -0700 (Tue, 24 Jul 2012)

Log Message

[EFL][WK2] Fix possible crash in didSendRequestForResource
https://bugs.webkit.org/show_bug.cgi?id=92077

Patch by Christophe Dumez <[email protected]> on 2012-07-24
Reviewed by Kenneth Rohde Christiansen.

Add NULL check for wkRedirectResponse in
didSendRequestForResource() before using it. The
argument may be NULL if there was no redirection.

* UIProcess/API/efl/ewk_view.h:
* UIProcess/API/efl/ewk_view_resource_load_client.cpp:
(didSendRequestForResource):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (123443 => 123444)


--- trunk/Source/WebKit2/ChangeLog	2012-07-24 09:17:30 UTC (rev 123443)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-24 09:21:37 UTC (rev 123444)
@@ -1,5 +1,20 @@
 2012-07-24  Christophe Dumez  <[email protected]>
 
+        [EFL][WK2] Fix possible crash in didSendRequestForResource
+        https://bugs.webkit.org/show_bug.cgi?id=92077
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add NULL check for wkRedirectResponse in
+        didSendRequestForResource() before using it. The
+        argument may be NULL if there was no redirection.
+
+        * UIProcess/API/efl/ewk_view.h:
+        * UIProcess/API/efl/ewk_view_resource_load_client.cpp:
+        (didSendRequestForResource):
+
+2012-07-24  Christophe Dumez  <[email protected]>
+
         [WK2][EFL][GTK] Share WebCoreArgumentCoders for soup-related types
         https://bugs.webkit.org/show_bug.cgi?id=92073
 

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h (123443 => 123444)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h	2012-07-24 09:17:30 UTC (rev 123443)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h	2012-07-24 09:21:37 UTC (rev 123444)
@@ -161,7 +161,7 @@
 struct _Ewk_Web_Resource_Request {
     Ewk_Web_Resource *resource; /**< resource being requested */
     Ewk_Url_Request *request; /**< URL request for the resource */
-    Ewk_Url_Response *redirect_response; /**< Possible redirect response for the resource */
+    Ewk_Url_Response *redirect_response; /**< Possible redirect response for the resource or @c NULL */
 };
 
 /// Creates a type name for _Ewk_Web_Resource_Load_Response.

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_resource_load_client.cpp (123443 => 123444)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_resource_load_client.cpp	2012-07-24 09:17:30 UTC (rev 123443)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_resource_load_client.cpp	2012-07-24 09:21:37 UTC (rev 123444)
@@ -44,6 +44,7 @@
 #include "ewk_web_resource_private.h"
 #include <wtf/text/CString.h>
 
+using namespace WebCore;
 using namespace WebKit;
 
 static inline Evas_Object* toEwkView(const void* clientInfo)
@@ -66,10 +67,11 @@
 static void didSendRequestForResource(WKPageRef, WKFrameRef, uint64_t resourceIdentifier, WKURLRequestRef wkRequest, WKURLResponseRef wkRedirectResponse, const void* clientInfo)
 {
     Ewk_Url_Request* request = ewk_url_request_new(wkRequest);
-    Ewk_Url_Response* redirectResponse = ewk_url_response_new(toImpl(wkRedirectResponse)->resourceResponse());
+    Ewk_Url_Response* redirectResponse = wkRedirectResponse ? ewk_url_response_new(toImpl(wkRedirectResponse)->resourceResponse()) : 0;
     ewk_view_resource_request_sent(toEwkView(clientInfo), resourceIdentifier, request, redirectResponse);
     ewk_url_request_unref(request);
-    ewk_url_response_unref(redirectResponse);
+    if (redirectResponse)
+        ewk_url_response_unref(redirectResponse);
 }
 
 static void didReceiveResponseForResource(WKPageRef, WKFrameRef, uint64_t resourceIdentifier, WKURLResponseRef wkResponse, const void* clientInfo)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to