diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:15:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:15:59 +0000 |
| commit | 489b73a4c69e01167e693d7153f973105c613c30 (patch) | |
| tree | 5d72d5ab3cf7dd8efa4e1733579d216d79c8ad66 /epan/radius_dict.l | |
| parent | Releasing progress-linux version 4.2.5-2~progress7.99u1. (diff) | |
| download | wireshark-489b73a4c69e01167e693d7153f973105c613c30.tar.xz wireshark-489b73a4c69e01167e693d7153f973105c613c30.zip | |
Merging upstream version 4.2.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | epan/radius_dict.l | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/radius_dict.l b/epan/radius_dict.l index c8c1825c..6b0d1b54 100644 --- a/epan/radius_dict.l +++ b/epan/radius_dict.l @@ -362,6 +362,7 @@ static void add_value(Radius_scanner_state_t* state, const gchar* attrib_name, c yyextra->fullpaths[yyextra->include_stack_ptr] = ws_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", yyextra->directory,yytext); + FILE *old_yyin = yyin; yyin = ws_fopen( yyextra->fullpaths[yyextra->include_stack_ptr], "r" ); if (!yyin) { @@ -378,6 +379,7 @@ static void add_value(Radius_scanner_state_t* state, const gchar* attrib_name, c g_free(yyextra->fullpaths[yyextra->include_stack_ptr]); yyextra->fullpaths[yyextra->include_stack_ptr] = NULL; yyextra->include_stack_ptr--; + yyin = old_yyin; } else { yyextra->linenums[yyextra->include_stack_ptr] = 1; yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE, yyscanner), yyscanner); |