Changeset 69848 in webkit

Timestamp:

Oct 15, 2010 3:39:07 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-15 Sergio Villar Senin <​svillar@igalia.com>

Reviewed by Xan Lopez.

[GTK] Do a stricter check for invalid base64 dataURLs
​https://bugs.webkit.org/show_bug.cgi?id=47717

Restore the strict base64 decoding we added in
​https://bugs.webkit.org/show_bug.cgi?id=44261 and then rolled back
in ​https://bugs.webkit.org/show_bug.cgi?id=47666 due to a failing
test. The actual issue was that we were not finishing the load of
the resource gracefully when an error happened.

Loading invalid base64-encoded data:// URLs are now handled
properly.

• platform/network/soup/ResourceHandleSoup.cpp: (WebCore::parseDataUrl):
• platform/network/soup/cache/soup-request-data.c: (webkit_soup_request_data_send):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (2 diffs)
• platform/network/soup/cache/soup-request-data.c (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-15  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Do a stricter check for invalid base64 dataURLs
+        https://bugs.webkit.org/show_bug.cgi?id=47717
+
+        Restore the strict base64 decoding we added in
+        https://bugs.webkit.org/show_bug.cgi?id=44261 and then rolled back
+        in https://bugs.webkit.org/show_bug.cgi?id=47666 due to a failing
+        test. The actual issue was that we were not finishing the load of
+        the resource gracefully when an error happened.
+
+        Loading invalid base64-encoded data:// URLs are now handled
+        properly.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::parseDataUrl):
+        * platform/network/soup/cache/soup-request-data.c:
+        (webkit_soup_request_data_send):
+
 2010-10-15  Alejandro G. Castro  <alex@igalia.com>
 

trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -349 +349 @@
     if (error) {
         d->m_soupRequest = 0;
+        client->didFinishLoading(handle, 0);
         return false;
     }
@@ -355 +356 @@
     if (error) {
         d->m_inputStream = 0;
+        client->didFinishLoading(handle, 0);
         return false;
     }

trunk/WebCore/platform/network/soup/cache/soup-request-data.c

@@ -99 +99 @@
 
                 if (base64) {
-                        buf = g_base64_decode (start, &data->priv->content_length);
+                        int inlen, state = 0;
+                        guint save = 0;
 
-                        if (!buf || data->priv->content_length <= 0) {
+                        inlen = strlen (start);
+                        buf = g_malloc0 (inlen * 3 / 4 + 3);
+                        data->priv->content_length =
+                                g_base64_decode_step (start, inlen, buf,
+                                                      &state, &save);
+                        if (state != 0) {
                                 g_free (buf);
                                 goto fail;