[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit cb99ad394767f0f50110f65f4341c72d23eb596a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 22:20:39 2010 +0000

    2010-01-06  Eric Seidel  <eric at webkit.org>
    
            No review, rolling out r52862.
            http://trac.webkit.org/changeset/52862
            https://bugs.webkit.org/show_bug.cgi?id=33258
    
            Caused svg/W3C-SVG-1.1/linking-a-01-b.svg to crash on the
            Leopard Release builder.
    
            * platform/image-decoders/png/PNGImageDecoder.cpp:
            (WebCore::PNGImageReader::decode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d46789d..ed4838b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-06  Eric Seidel  <eric at webkit.org>
+
+        No review, rolling out r52862.
+        http://trac.webkit.org/changeset/52862
+        https://bugs.webkit.org/show_bug.cgi?id=33258
+
+        Caused svg/W3C-SVG-1.1/linking-a-01-b.svg to crash on the
+        Leopard Release builder.
+
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::PNGImageReader::decode):
+
 2010-01-06  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Not reviewed. Revert the part of my last commit touching Base.xcconfig, was not meant to be commited.
diff --git a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
index d2705f9..fa2c8b6 100644
--- a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -119,7 +119,7 @@ public:
             m_currentBufferSize = m_readOffset;
             png_process_data(m_png, m_info, reinterpret_cast<png_bytep>(const_cast<char*>(segment)), segmentLength);
             if ((sizeOnly && decoder->isSizeAvailable()) || m_hasFinishedDecoding)
-                return;
+                break;
         }
         if (!m_hasFinishedDecoding && decoder->isAllDataReceived())
             decoder->pngComplete();

-- 
WebKit Debian packaging