Changeset 119

Timestamp:

Aug 26, 2006, 12:51:01 AM (19 years ago)

Author:

dmik

Message:

Tools: Fixed SYS3184 (divide-by-zero) in qt_os2QString2MB() (used by QString::local8Bit()) happened when the target codepage required more than one byte per some Unicode character, e.g. in Japanese locales [thanks to achain].

File:

• trunk/src/tools/qstring.cpp (modified) (3 diffs)

trunk/src/tools/qstring.cpp

@@ -6976 +6976 @@
     UniChar *ucPtr = (UniChar *) s.unicode();
     size_t ucLeft = uclen;
-    
+
+    // be optimistic (imply that one byte is necessary per every Unicode char)
     size_t mblen = uclen;
     QCString mbBuf( mblen + 1 );
@@ -6991 +6992 @@
             size_t mbDone = mblen - mbLeft;
             size_t ucDone = uclen - ucLeft;
-            // assume that ucLeft/mbLeft is an approximation of ucDone/mbDone
-            mblen = mbDone + (ucLeft * mbDone) / ucDone; 
+            size_t newLen = mblen;
+            if ( ucDone ) {
+                // assume that ucLeft/mbLeft is an approximation of ucDone/mbDone
+                newLen = mbDone + (ucLeft * mbDone) / ucDone;
+            }
+            if ( newLen == mblen ) {
+                // could not process a single Unicode char, double the size
+                mblen *= 2;
+            } else {
+                mblen = newLen;
+            }
             mbBuf.resize( mblen + 1 );
             mbPtr = mbBuf.data() + mbDone;
+            mbLeft = mblen - mbDone;
         } else if ( rc != ULS_SUCCESS ) {
 #ifndef QT_NO_DEBUG
@@ -7004 +7015 @@
         }
     }
-    mbBuf[ mblen - mbLeft ] = '\0';
+    mbBuf.truncate( mblen - mbLeft );
     return mbBuf;
 }