Commit e2597756 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 705586 - @code tag as the last line of a comment block causes the parser to hang

parent 69af1c8a
...@@ -1831,10 +1831,11 @@ static void findEndOfLine(GrowBuf &out,const char *data,int size, ...@@ -1831,10 +1831,11 @@ static void findEndOfLine(GrowBuf &out,const char *data,int size,
) )
{ {
QCString endBlockName = isBlockCommand(data+end-1,end-1,size-(end-1)); QCString endBlockName = isBlockCommand(data+end-1,end-1,size-(end-1));
end++;
if (!endBlockName.isEmpty()) if (!endBlockName.isEmpty())
{ {
int l = endBlockName.length(); int l = endBlockName.length();
for (;end<size-l;end++) // search for end of block marker for (;end<size-l-1;end++) // search for end of block marker
{ {
if ((data[end]=='\\' || data[end]=='@') && if ((data[end]=='\\' || data[end]=='@') &&
data[end-1]!='\\' && data[end-1]!='@' data[end-1]!='\\' && data[end-1]!='@'
...@@ -1858,10 +1859,6 @@ static void findEndOfLine(GrowBuf &out,const char *data,int size, ...@@ -1858,10 +1859,6 @@ static void findEndOfLine(GrowBuf &out,const char *data,int size,
} }
} }
} }
else
{
end++;
}
} }
else if (nb==0 && data[end-1]=='<' && end<size-6 && else if (nb==0 && data[end-1]=='<' && end<size-6 &&
(end<=1 || (data[end-2]!='\\' && data[end-2]!='@')) (end<=1 || (data[end-2]!='\\' && data[end-2]!='@'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment