summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-12-17 19:01:14 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-12-17 19:01:14 (GMT)
commit050fce2b73d6e4455808ab86da2fddcf2f26e9b5 (patch)
treeb8fdecd6098a74a357b1a820d7cd4f8a81ec1736
parent2716fc48889c3cffe46903cdb3a64bb0ac735449 (diff)
downloadDoxygen-050fce2b73d6e4455808ab86da2fddcf2f26e9b5.zip
Doxygen-050fce2b73d6e4455808ab86da2fddcf2f26e9b5.tar.gz
Doxygen-050fce2b73d6e4455808ab86da2fddcf2f26e9b5.tar.bz2
Bug 741417 - Crash when building gtkmm documentation
-rw-r--r--qtools/qcstring.cpp4
-rw-r--r--src/doxygen.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/qtools/qcstring.cpp b/qtools/qcstring.cpp
index fdd9971..49bf842 100644
--- 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
index f0a8719..b9437f6 100644
--- 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+="::";