Bug 723314 - Doxygen crashes on incorrect end group /**< @} */ (b4d5ef17) · Commits · Elphel / doxverilog

src/scanner.l

+14 −2

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

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

	docBlockContext = SkipCurlyEndDoc;		docBlockContext = SkipCurlyEndDoc;
	docBlockInBody = FALSE;		docBlockInBody = FALSE;
	@@ -5062,7 +5063,11 @@ OPERATOR "operator"{B}*({ARITHOP}\|{ASSIGNOP}\|{LOGICOP}\|{BITOP})
	}		}
	<SkipCurlyEndDoc>"}" {		<SkipCurlyEndDoc>"}" {
	//addToBody("}");		//addToBody("}");
			if (tempEntry) // we can only switch back to current if no new item was created
			{
	current = tempEntry;		current = tempEntry;
			tempEntry = 0;
			}
	BEGIN( lastCurlyContext );		BEGIN( lastCurlyContext );
	}		}
	<SkipCurly>\" {		<SkipCurly>\" {
	@@ -6514,8 +6519,15 @@ static void startCommentBlock(bool brief)
	//----------------------------------------------------------------------------		//----------------------------------------------------------------------------

	static void newEntry()		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);		current_root->addSubEntry(current);
			}
			tempEntry = 0;
	previous = current;		previous = current;
	current = new Entry ;		current = new Entry ;
	initEntry();		initEntry();