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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdelibs/kdecore
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-06-01 1:53:53
Message-ID: 20040601015353.CC0B51703 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

don't hang on unterminated braced expandos


  M +3 -1      kmacroexpander.cpp   1.6.6.1


--- kdelibs/kdecore/kmacroexpander.cpp  #1.6:1.6.6.1
@@ -402,5 +402,7 @@ KMacroMapExpander<QString,VT>::expandEsc
     if (str[pos + 1] == '{') {
         rpos = pos + 2;
-        for (sl = 0; str[rpos + sl] != '}'; sl++);
+        for (sl = 0; str[rpos + sl] != '}'; sl++)
+            if (rpos + sl >= str.length())
+                return 0;
         rsl = sl + 3;
     } else {


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