[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 14:38:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit af2ad412e49898bd975909aae87d2ad80e97de0d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 17:13:59 2010 +0000

    2010-10-14  Sergio Villar Senin  <svillar at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Failing test LayoutTests/editing/undo/orphaned-selection-crash-bug32823-2.html
            https://bugs.webkit.org/show_bug.cgi?id=47666
    
            Do a less strict decoding of base64 data url's as it was done
            before. The actual problem is most likely
            https://bugs.webkit.org/show_bug.cgi?id=47661 tough.
    
            * platform/network/soup/cache/soup-request-data.c:
            (webkit_soup_request_data_send):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69775 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f180fc1..acaf9fe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-14  Sergio Villar Senin  <svillar at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Failing test LayoutTests/editing/undo/orphaned-selection-crash-bug32823-2.html
+        https://bugs.webkit.org/show_bug.cgi?id=47666
+
+        Do a less strict decoding of base64 data url's as it was done
+        before. The actual problem is most likely
+        https://bugs.webkit.org/show_bug.cgi?id=47661 tough.
+
+        * platform/network/soup/cache/soup-request-data.c:
+        (webkit_soup_request_data_send):
+
 2010-10-14  Renata Hodovan  <reni at inf.u-szeged.hu>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/network/soup/cache/soup-request-data.c b/WebCore/platform/network/soup/cache/soup-request-data.c
index 9849269..80e30f5 100644
--- a/WebCore/platform/network/soup/cache/soup-request-data.c
+++ b/WebCore/platform/network/soup/cache/soup-request-data.c
@@ -98,15 +98,9 @@ webkit_soup_request_data_send (WebKitSoupRequest   *request,
 		guchar *buf;
 
 		if (base64) {
-			int inlen, state = 0;
-			guint save = 0;
-
-			inlen = strlen (start);
-			buf = g_malloc (inlen * 3 / 4);
-			data->priv->content_length =
-				g_base64_decode_step (start, inlen, buf,
-						      &state, &save);
-			if (state != 0) {
+			buf = g_base64_decode (start, &data->priv->content_length);
+
+			if (!buf || data->priv->content_length <= 0) {
 				g_free (buf);
 				goto fail;
 			}

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list