[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit a6b728be8039f7f863429571d7d30a420b54b62c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 30 15:35:10 2009 +0000

    2009-09-30  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Fix TextCodecQt::decode method after r48752 to return a non-null string if the length of the input is 0.
            This fixes https://bugs.webkit.org/show_bug.cgi?id=29736.
    
            * platform/text/qt/TextCodecQt.cpp:
            (WebCore::TextCodecQt::decode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aacc3dc..11017b5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-30  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix TextCodecQt::decode method after r48752 to return a non-null string if the length of the input is 0.
+        This fixes https://bugs.webkit.org/show_bug.cgi?id=29736.
+
+        * platform/text/qt/TextCodecQt.cpp:
+        (WebCore::TextCodecQt::decode):
+
 2009-09-29  Dave Hyatt  <hyatt at apple.com>
 
         Reviewed by Jon Honeycutt.
diff --git a/WebCore/platform/text/qt/TextCodecQt.cpp b/WebCore/platform/text/qt/TextCodecQt.cpp
index e351522..b3f75cc 100644
--- a/WebCore/platform/text/qt/TextCodecQt.cpp
+++ b/WebCore/platform/text/qt/TextCodecQt.cpp
@@ -104,7 +104,7 @@ String TextCodecQt::decode(const char* bytes, size_t length, bool flush, bool /*
 #endif
     const char* buf = bytes;
     const char* end = buf + length;
-    String unicode;
+    String unicode(""); // a non-null string is expected
 
     while (buf < end) {
         int size = end - buf;

-- 
WebKit Debian packaging