summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-10-26 13:20:31 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-10-26 13:20:31 (GMT)
commit6298c83b5061fb264c15e2a6c76fed32e7f8427d (patch)
tree6ef800d8b4e7527684354ad2deddf88443597422 /src/scanner.l
parentf43b013e2b554b089c7350b32238043acbe0abdf (diff)
downloadDoxygen-6298c83b5061fb264c15e2a6c76fed32e7f8427d.zip
Doxygen-6298c83b5061fb264c15e2a6c76fed32e7f8427d.tar.gz
Doxygen-6298c83b5061fb264c15e2a6c76fed32e7f8427d.tar.bz2
Bug 710917 - Segfault while parsing a C file
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 66ea314..f0067b0 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -4962,6 +4962,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
//addToBody(yytext);
++curlyCount ;
}
+<SkipCurly>"}"/{BN}*("/*!"|"/**"|"//!"|"///")"<!--" | /* see bug710917 */
<SkipCurly>"}" {
//addToBody(yytext);
if( curlyCount )
@@ -4970,22 +4971,6 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
else
{
-#if 0
- if (!Config_getBool("HIDE_IN_BODY_DOCS") &&
- !current->doc.isEmpty())
- {
- // copy documentation found inside the body
- // to the previous item
- if (previous->inbodyLine==-1)
- {
- previous->inbodyLine = current->docLine;
- previous->inbodyFile = current->docFile;
- }
- //printf("*** inbodyDocs+=%s\n",current->doc.data());
- previous->inbodyDocs += current->doc;
- current->doc.resize(0);
- }
-#endif
if (current->sli && previous) // copy special list items
{
QListIterator<ListItemInfo> li(*current->sli);