Bug 741417 - Crash when building gtkmm documentation

Dimitri van Heesch · Dimitri van Heesch · commit 050fce2b73d6 · 2014-12-17T20:01:14.000+01:00
diff --git a/qtools/qcstring.cpp b/qtools/qcstring.cpp
@@ -247,9 +247,9 @@ QCString QCString::right( uint len ) const
 
 QCString QCString::mid( uint index, uint len) const
 {
-  int slen = length();
+  uint slen = (uint)length();
   if (len==0xffffffff) len = slen-index;
-  if (isEmpty() || (int)index>=slen || len==0)
+  if (isEmpty() || index>=slen || len==0)
   {
     return QCString();
   }
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
@@ -1010,6 +1010,7 @@ static Definition *buildScopeFromQualifiedName(const QCString name,
   while (i<level)
   {
     int idx=getScopeFragment(name,p,&l);
+    if (idx==-1) return prevScope;
     QCString nsName = name.mid(idx,l);
     if (nsName.isEmpty()) return prevScope;
     if (!fullScope.isEmpty()) fullScope+="::";

Original file line number	Diff line number	Diff line change
`@@ -247,9 +247,9 @@ QCString QCString::right( uint len ) const`
`247`	`247`
`248`	`248`	`QCString QCString::mid( uint index, uint len) const`
`249`	`249`	`{`
`250`		`- int slen = length();`
	`250`	`+ uint slen = (uint)length();`
`251`	`251`	`if (len==0xffffffff) len = slen-index;`
`252`		`- if (isEmpty() \|\| (int)index>=slen \|\| len==0)`
	`252`	`+ if (isEmpty() \|\| index>=slen \|\| len==0)`
`253`	`253`	`{`
`254`	`254`	`return QCString();`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1010,6 +1010,7 @@ static Definition *buildScopeFromQualifiedName(const QCString name,`
`1010`	`1010`	`while (i<level)`
`1011`	`1011`	`{`
`1012`	`1012`	`int idx=getScopeFragment(name,p,&l);`
	`1013`	`+ if (idx==-1) return prevScope;`
`1013`	`1014`	`QCString nsName = name.mid(idx,l);`
`1014`	`1015`	`if (nsName.isEmpty()) return prevScope;`
`1015`	`1016`	`if (!fullScope.isEmpty()) fullScope+="::";`