Permalink
Browse files

Fix potential crash when reading tag file which contained nested java…

… classes using generics

Also fixed a parse error when reading a tag file with a Java-style enum
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Aug 26, 2014
1 parent 745955f commit 6d4044ad43ae1424a256eb1c26992301e7c64f4a
Showing with 18 additions and 4 deletions.
  1. +10 −3 src/doxygen.cpp
  2. +8 −1 src/tagreader.cpp
View
@@ -1037,9 +1037,16 @@ static Definition *buildScopeFromQualifiedName(const QCString name,
else // scope is a namespace
{
}
// make the parent/child scope relation
prevScope->addInnerCompound(innerScope);
innerScope->setOuterScope(prevScope);
if (innerScope)
{
// make the parent/child scope relation
prevScope->addInnerCompound(innerScope);
innerScope->setOuterScope(prevScope);
}
else // current scope is a class, so return only the namespace part...
{
return prevScope;
}
// proceed to the next scope fragment
p=idx+l+2;
prevScope=innerScope;
View
@@ -95,7 +95,7 @@ class TagMemberInfo
class TagClassInfo
{
public:
enum Kind { Class, Struct, Union, Interface, Exception, Protocol, Category };
enum Kind { Class, Struct, Union, Interface, Exception, Protocol, Category, Enum };
TagClassInfo() { bases=0, templateArguments=0; members.setAutoDelete(TRUE); isObjC=FALSE; }
~TagClassInfo() { delete bases; delete templateArguments; }
QCString name;
@@ -301,6 +301,12 @@ class TagFileParser : public QXmlDefaultHandler
m_curClass->kind = TagClassInfo::Interface;
m_state = InClass;
}
else if (kind=="enum")
{
m_curClass = new TagClassInfo;
m_curClass->kind = TagClassInfo::Enum;
m_state = InClass;
}
else if (kind=="exception")
{
m_curClass = new TagClassInfo;
@@ -1286,6 +1292,7 @@ void TagFileParser::buildLists(Entry *root)
case TagClassInfo::Struct: ce->spec = Entry::Struct; break;
case TagClassInfo::Union: ce->spec = Entry::Union; break;
case TagClassInfo::Interface: ce->spec = Entry::Interface; break;
case TagClassInfo::Enum: ce->spec = Entry::Enum; break;
case TagClassInfo::Exception: ce->spec = Entry::Exception; break;
case TagClassInfo::Protocol: ce->spec = Entry::Protocol; break;
case TagClassInfo::Category: ce->spec = Entry::Category; break;

0 comments on commit 6d4044a

Please sign in to comment.