From 6298c83b5061fb264c15e2a6c76fed32e7f8427d Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Sat, 26 Oct 2013 15:20:31 +0200
Subject: Bug 710917 - Segfault while parsing a C file

---
 src/scanner.l | 17 +----------------
 1 file changed, 1 insertion(+), 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);
-- 
cgit v0.12