[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mrobinson at webkit.org
mrobinson at webkit.org
Sun Feb 20 23:07:34 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit f763db6cfd6da1fd49e49905efd8417c520bad5b
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 17 22:48:13 2011 +0000
2011-01-17 Martin Robinson <mrobinson at igalia.com>
Reviewed by Andreas Kling.
[GTK] Port a crash fix from libsoup upstream to the libsoup cache code
https://bugs.webkit.org/show_bug.cgi?id=52586
No new tests. This is just a merge from upstream.
* platform/network/soup/cache/soup-http-input-stream.c:
(webkit_soup_http_input_stream_got_chunk): Properly handle unsigned numbers.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75972 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7d88f3b..fd5504d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-17 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Andreas Kling.
+
+ [GTK] Port a crash fix from libsoup upstream to the libsoup cache code
+ https://bugs.webkit.org/show_bug.cgi?id=52586
+
+ No new tests. This is just a merge from upstream.
+
+ * platform/network/soup/cache/soup-http-input-stream.c:
+ (webkit_soup_http_input_stream_got_chunk): Properly handle unsigned numbers.
+
2011-01-17 Tony Gentilcore <tonyg at chromium.org>
Reviewed by Alexey Proskuryakov.
diff --git a/Source/WebCore/platform/network/soup/cache/soup-http-input-stream.c b/Source/WebCore/platform/network/soup/cache/soup-http-input-stream.c
index 195c458..2a5d995 100644
--- a/Source/WebCore/platform/network/soup/cache/soup-http-input-stream.c
+++ b/Source/WebCore/platform/network/soup/cache/soup-http-input-stream.c
@@ -267,7 +267,7 @@ webkit_soup_http_input_stream_got_chunk (SoupMessage *msg, SoupBuffer *chunk_buf
g_warning ("webkit_soup_http_input_stream_got_chunk called again before previous chunk was processed");
/* Copy what we can into priv->caller_buffer */
- if (priv->caller_bufsize - priv->caller_nread > 0) {
+ if (priv->caller_bufsize > priv->caller_nread) {
gsize nread = MIN (chunk_size, priv->caller_bufsize - priv->caller_nread);
memcpy (priv->caller_buffer + priv->caller_nread, chunk, nread);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list