Commit b4d5ef17 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 723314 - Doxygen crashes on incorrect end group /**< @} */

parent 0eaf1cd5

src/scanner.l

+14 −2
Original line number Diff line number Diff line
@@ -5023,6 +5023,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) 


					    tempEntry = current; // temporarily switch to the previous entry

					    current = previous;

					    previous = 0;



					    docBlockContext   = SkipCurlyEndDoc;

					    docBlockInBody    = FALSE;
@@ -5062,7 +5063,11 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) 
  					}

<SkipCurlyEndDoc>"}"			{

  				          //addToBody("}");

                                          if (tempEntry) // we can only switch back to current if no new item was created

					  {

					    current = tempEntry;

					    tempEntry = 0;

					  }

  					  BEGIN( lastCurlyContext );

  					}

<SkipCurly>\"			        {
@@ -6514,8 +6519,15 @@ static void startCommentBlock(bool brief) 
//----------------------------------------------------------------------------



static void newEntry()

{

  if (tempEntry==0) // if temp entry is not 0, it holds current, 

                    // and current is actually replaced by previous which was 

                    // already added to current_root, so we should not add it again 

                    // (see bug723314)

  {

    current_root->addSubEntry(current);

  }

  tempEntry = 0;

  previous = current;

  current = new Entry ;

  initEntry();