[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 556909 by okellogg:

skipToClosing(): Add check for QString::null return value from advance().
BUG:130093


 M  +1 -1      ChangeLog  
 M  +2 -0      umbrello/javaimport.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #556908:556909
@@ -1,7 +1,7 @@
 Version 1.5.4
 
 * Bugs/wishes from http://bugs.kde.org:
-* Fix crash when importing classes from a java file (129107)
+* Fix crash when importing classes from a java file (129107, 130093)
 * Crash after single click on the "UML Model" tree window (126560/129252)
 
 Version 1.5.3
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/javaimport.cpp #556908:556909
@@ -111,6 +111,8 @@
     int nesting = 0;
     while (m_srcIndex < srcLength) {
         QString nextToken = advance();
+        if (nextToken.isEmpty())
+            break;
         if (nextToken == closing) {
             if (nesting <= 0)
                 break;