Changeset 17693 in webkit

Timestamp:

Nov 9, 2006 1:40:45 PM (17 years ago)

Author:

zbujtas

Message:

2006-11-09 raalexan <​rasvan.alexandrescu@nokia.com>

Reviewed by zalan.
DESC: fix brake in chineese variant for google search
​http://bugs.webkit.org/show_bug.cgi?id=11414

• kwq/KWQTextCodec.cpp: (KWQTextDecoder::fromUnicode): (KWQTextDecoder::checkRealloc):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• kwq/KWQTextCodec.cpp (modified) (4 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-09  raalexan  <rasvan.alexandrescu@nokia.com>
+
+        Reviewed by zalan.
+        DESC: fix brake in chineese variant for google search
+        http://bugs.webkit.org/show_bug.cgi?id=11414
+
+        * kwq/KWQTextCodec.cpp:
+        (KWQTextDecoder::fromUnicode):
+        (KWQTextDecoder::checkRealloc):
+
 2006-11-08  yaharon  <yael.aharon@nokia.com>
 

S60/trunk/WebCore/kwq/KWQTextCodec.cpp

@@ -63 +63 @@
     QString convertLatin1(const unsigned char *chs, int len);
     static CArrayFix<CCnvCharacterSetConverter::SCharacterSet>* iArrayOfCharacterSetsAvailable;
+    HBufC8* checkRealloc( TPtr8& , TInt );
     TUint iEncoding;
     HBufC8 * iRemainderBuf;
@@ -500 +501 @@
 
     // guess the size of out buffer, try to minimize reallocation
-    // the last added 1 is for the ptr which is zeroed later
-    HBufC8* outBuf = HBufC8::NewMaxL( str.length() * 2 + 1 + 1 );
+    HBufC8* outBuf = HBufC8::NewMaxL( str.length() * 2 + 1 );
     TPtr8 ptr( outBuf->Des() );
     ptr.SetLength( 0 );
@@ -512 +512 @@
 
         // copy result to out buffer
-        TInt orgLen = ptr.Length();
         if( ptr.Length() + tmpBuf.Length() > ptr.MaxLength() )
             {
-            HBufC8* temp = outBuf->ReAlloc( ptr.MaxLength() + tmpBuf.MaxLength() );
-            if( !temp )
+            HBufC8* temp = checkRealloc( ptr, (ptr.MaxLength() + tmpBuf.MaxLength()) );
+            delete outBuf;
+            if(temp)
                 {
-                delete outBuf;
+                outBuf = temp;
+                }
+            else
+                {
                 return QCString("");
                 }
+            }
+        
+        ptr.Append( tmpBuf );
+
+        if( ret == 0 ) break;
+        inBuf.Set( inBuf.Right( ret ) );
+        }
+    
+    //check if realloc needs for zero terminated string
+    if(ptr.MaxLength() == ptr.Length())
+        {
+        HBufC8* temp = checkRealloc( ptr, ptr.MaxLength() + 1);
+        delete outBuf;
+        if(temp)
+            {
             outBuf = temp;
-            ptr.Set( outBuf->Des() );
-            ptr.SetLength( orgLen );
-            }
-
-        ptr.Append( tmpBuf );
-
-        if( ret == 0 ) break;
-
-        inBuf.Set( inBuf.Right( ret ) );
-        }
-
+            }
+        else
+            {
+            return QCString("");
+            }
+        }
+    
     outStr.append( (const char*)( ptr.PtrZ() ) );
     delete outBuf;
@@ -538 +552 @@
     return outStr;
     }
+
+HBufC8* KWQTextDecoder::checkRealloc( TPtr8& aPtr, TInt aLen )
+{    
+   HBufC8* outBuf = HBufC8::NewMax( aLen );
+   if(outBuf)
+        {
+        outBuf->Des().Copy( aPtr );
+        aPtr.Set( outBuf->Des() );
+        aPtr.SetLength( aLen );
+        }
+   return outBuf;
+}
+
 
 QString KWQTextDecoder::windows125xToUnicode( const char *chs, int len )