jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1656 from mcfarljm/Issue-1647

Browse source 
Fix doxygen crash with empty comment (Issue #1647)
This commit is contained in:
William S Fulton 2020-01-14 19:54:38 +00:00 • committed by GitHub
commit fa58fd53b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/doxygen_basic_translate.i
View file

@ -107,6 +107,9 @@ double Atan2(double y, double x)
return 0; return 0;
} }
/* Regression test for crash with empty comment: */
/**/
/** /**
* Comment at the end of file should be ignored. * Comment at the end of file should be ignored.
*/ */

5
Source/CParse/cscanner.c
View file

@ -435,10 +435,11 @@ static int yylook(void) {
if (scan_doxygen_comments) { /* else just skip this node, to avoid crashes in parser module*/ if (scan_doxygen_comments) { /* else just skip this node, to avoid crashes in parser module*/
/* Check for all possible Doxygen comment start markers while ignoring /* Check for all possible Doxygen comment start markers while ignoring
comments starting with a row of asterisks or slashes just as comments starting with a row of asterisks or slashes just as
Doxygen itself does. */ Doxygen itself does. Also skip empty comment (slash-star-star-slash),
which causes a crash due to begin > end. */
if (Len(cmt) > 3 && loc[0] == '/' && if (Len(cmt) > 3 && loc[0] == '/' &&
((loc[1] == '/' && ((loc[2] == '/' && loc[3] != '/') || loc[2] == '!')) || ((loc[1] == '/' && ((loc[2] == '/' && loc[3] != '/') || loc[2] == '!')) ||
(loc[1] == '*' && ((loc[2] == '*' && loc[3] != '*') || loc[2] == '!')))) { (loc[1] == '*' && ((loc[2] == '*' && loc[3] != '*' && loc[3] != '/') || loc[2] == '!')))) {
comment_kind_t this_comment = loc[3] == '<' ? DOX_COMMENT_POST : DOX_COMMENT_PRE; comment_kind_t this_comment = loc[3] == '<' ? DOX_COMMENT_POST : DOX_COMMENT_PRE;
if (existing_comment != DOX_COMMENT_NONE && this_comment != existing_comment) { if (existing_comment != DOX_COMMENT_NONE && this_comment != existing_comment) {
/* We can't concatenate together Doxygen pre- and post-comments. */ /* We can't concatenate together Doxygen pre- and post-comments. */