[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4c22fa8efc40273f5ad59ca13870fb2c0212c22d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 27 06:31:45 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3463624 -- page at cinemakorea.com shows up blank due to kTECBufferBelowMinimumSizeErr from TEC
    
            * kwq/KWQTextCodec.mm: (KWQTextDecoder::convertOneChunkUsingTEC): To work around the bug
            I found in the decoder (Radar 3351093), change kTECBufferBelowMinimumSizeErr to
            kTECOutputBufferFullStatus in cases where bytes were actually converted.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3879271..9478fda 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,16 @@
 
         Reviewed by Maciej.
 
+        - fixed 3463624 -- page at cinemakorea.com shows up blank due to kTECBufferBelowMinimumSizeErr from TEC
+
+        * kwq/KWQTextCodec.mm: (KWQTextDecoder::convertOneChunkUsingTEC): To work around the bug
+        I found in the decoder (Radar 3351093), change kTECBufferBelowMinimumSizeErr to
+        kTECOutputBufferFullStatus in cases where bytes were actually converted.
+
+2003-10-26  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
         - fixed uses of NULL in non-pointer contexts
 
         * khtml/khtml_part.cpp: (findWordBoundary): Changed NULL to 0 and did a little code
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index f9b4110..66d83eb 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -393,6 +393,11 @@ OSStatus KWQTextDecoder::convertOneChunkUsingTEC(const unsigned char *inputBuffe
             static_cast<unsigned char *>(outputBuffer), outputBufferLength, &bytesWritten);
     }
 
+    // Work around bug 3351093, where sometimes we get kTECBufferBelowMinimumSizeErr instead of kTECOutputBufferFullStatus.
+    if (status == kTECBufferBelowMinimumSizeErr && bytesWritten != 0) {
+        status = kTECOutputBufferFullStatus;
+    }
+
     inputLength = bytesRead;
     outputLength = bytesWritten;
     return status;

-- 
WebKit Debian packaging