diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-11-10 12:32:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-10 12:32:45 (GMT) |
| commit | dc3aa117751718ab391be094243e9c966c126440 (patch) | |
| tree | 6c727f3c88648ec9a04dfa34ffe7ea98fee7c386 | |
| parent | acb5e06301a96165291f56d5d1fc21ec70256d76 (diff) | |
| parent | efc33490c36cb7c21955901ce0abccc343c0c7b3 (diff) | |
| download | Doxygen-dc3aa117751718ab391be094243e9c966c126440.zip Doxygen-dc3aa117751718ab391be094243e9c966c126440.tar.gz Doxygen-dc3aa117751718ab391be094243e9c966c126440.tar.bz2 | |
Merge pull request #6598 from albert-github/feature/issue_6597
issue_6597 SIGSEGV presumably caused by C++ "using" declaration
| -rw-r--r-- | src/defgen.cpp | 2 | ||||
| -rw-r--r-- | src/perlmodgen.cpp | 2 | ||||
| -rw-r--r-- | src/sqlite3gen.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/defgen.cpp b/src/defgen.cpp index cd69ab2..3ab311c 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -146,7 +146,7 @@ void generateDEFForMember(MemberDef *md, stringToArgumentList(md->argsString(),declAl); QCString fcnPrefix = " " + memPrefix + "param-"; - if (declAl->count()>0) + if (defAl && declAl->count()>0) { ArgumentListIterator declAli(*declAl); ArgumentListIterator defAli(*defAl); diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 5b4b6ea..ab55bfa 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -1609,7 +1609,7 @@ void PerlModGenerator::generatePerlModForMember(MemberDef *md,Definition *) m_output.openList("parameters"); ArgumentList *declAl = md->declArgumentList(); ArgumentList *defAl = md->argumentList(); - if (declAl && declAl->count()>0) + if (declAl && defAl && declAl->count()>0) { ArgumentListIterator declAli(*declAl); ArgumentListIterator defAli(*defAl); diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index a7d7f21..a7b8dbb 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -1017,7 +1017,7 @@ static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, co { ArgumentList *declAl = md->declArgumentList(); ArgumentList *defAl = md->argumentList(); - if (declAl!=0 && declAl->count()>0) + if (declAl!=0 && defAl!=0 && declAl->count()>0) { ArgumentListIterator declAli(*declAl); ArgumentListIterator defAli(*defAl); |