[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy/src/tools
From:       David Faure <faure () kde ! org>
Date:       2004-06-22 18:52:45
Message-ID: 20040622185245.AB72593A7 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Fixed out-of-bounds access in fromUtf8


  M +5 -2      qstring.cpp   1.65


--- qt-copy/src/tools/qstring.cpp  #1.64:1.65
@@ -5682,6 +5682,9 @@ QString QString::fromUtf8( const char* u
         return QString::null;
 
-    int slen = int(strlen(utf8));
-    len = len < 0 ? slen : QMIN(slen, len);
+    if (  len < 0 )
+        len = strlen( utf8 );
+    else
+        len = QMIN( strlen( utf8 ), len );
+
     QString result;
     result.setLength( len*2 ); // worst case


[prev in list] [next in list] [prev in thread] [next in thread]