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

dglazkov at chromium.org dglazkov at chromium.org
Wed Dec 22 13:42:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 08d347eb46962530e5d46436f7d28f69e39d03f1
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 21:49:59 2010 +0000

    2010-09-23  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Reviewed by David Levin.
    
            Fix a condition check in ServerProcess, which becomes relevant when reading binary data.
            https://bugs.webkit.org/show_bug.cgi?id=46406
    
            This breaks when the method is called with specified size of data (image data), and the
            buffer hasn't yet reached this size.
    
            * Scripts/webkitpy/layout_tests/port/server_process.py: Changed to check for values of
              index larger than 0.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68201 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 339878b..6cdac30 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-23  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by David Levin.
+
+        Fix a condition check in ServerProcess, which becomes relevant when reading binary data.
+        https://bugs.webkit.org/show_bug.cgi?id=46406
+
+        This breaks when the method is called with specified size of data (image data), and the
+        buffer hasn't yet reached this size.
+
+        * Scripts/webkitpy/layout_tests/port/server_process.py: Changed to check for values of
+          index larger than 0.
+
 2010-09-23  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Nate Chapin.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py
index 8e0bc11..5a0a40c 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py
@@ -179,7 +179,7 @@ class ServerProcess:
             elif size == 0:
                 index = self._output.find('\n') + 1
 
-            if index or self.crashed or self.timed_out:
+            if index > 0 or self.crashed or self.timed_out:
                 output = self._output[0:index]
                 self._output = self._output[index:]
                 return output

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list