luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ivlpp: Removed delayed_close 

This variable was used in yywrap purportedly to obviate
hidden access to a file that should be closable.

After investigating the code flex produces, it would
seem that these fears are unfounded.

Signed-off-by: Michael Witten <mfwitten@mit.edu>
This commit is contained in:
Michael Witten 2008-02-14 20:12:10 -05:00 committed by Stephen Williams
parent 3bdf0a13d6
commit 6103a72927
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ivlpp/lexor.lex
View File

@ -1259,15 +1259,12 @@ static int yywrap()
int line_mask_flag = 0; int line_mask_flag = 0;
struct include_stack_t*isp = istack; struct include_stack_t*isp = istack;
istack = isp->next; istack = isp->next;
FILE *delayed_close = (FILE *) 0;
/* Delete the current input buffers, and free the cell. */ /* Delete the current input buffers, and free the cell. */
yy_delete_buffer(YY_CURRENT_BUFFER); yy_delete_buffer(YY_CURRENT_BUFFER);
if (isp->file) { if (isp->file) {
/* Delay the close of this file, because the yyrestart
below seems to have some memory of this file. */
delayed_close = isp->file;
free(isp->path); free(isp->path);
fclose(isp->file);
} else { } else {
/* If I am printing line directives and I just finished /* If I am printing line directives and I just finished
macro substitution, I should terminate the line and macro substitution, I should terminate the line and
@ -1312,7 +1309,6 @@ static int yywrap()
} }
yyrestart(istack->file); yyrestart(istack->file);
if (delayed_close) fclose(delayed_close);
return 0; return 0;
} }
@ -1321,7 +1317,6 @@ static int yywrap()
top. If I need to print a line directive, do so. */ top. If I need to print a line directive, do so. */
yy_switch_to_buffer(istack->yybs); yy_switch_to_buffer(istack->yybs);
if (delayed_close) fclose(delayed_close);
if (line_direct_flag && istack->path && !line_mask_flag) if (line_direct_flag && istack->path && !line_mask_flag)
fprintf(yyout, "\n`line %u \"%s\" 2\n", fprintf(yyout, "\n`line %u \"%s\" 2\n",