summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-04-03 18:27:33 -0700
committerGuy Harris <guy@alum.mit.edu>2016-04-04 01:28:06 +0000
commitae841c74e5d68fb66ecca48acde2b3d58ee889ee (patch)
tree121b0a6f06ba2102fba2e4b1a39b4bcea2af141a /epan
parent3ae229c8ed78960bced85286a5041a1552b9506c (diff)
downloadwireshark-ae841c74e5d68fb66ecca48acde2b3d58ee889ee.tar.gz
Don't double-close the input.
Change-Id: I3f02227f9cda2ad4c878e2a736923919e10fbf25 Reviewed-on: https://code.wireshark.org/review/14802 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
-rw-r--r--epan/diam_dict.l5
-rw-r--r--epan/radius_dict.l6
2 files changed, 8 insertions, 3 deletions
diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index 3c450465dc..47aa11eb50 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -801,7 +801,10 @@ ddict_scan(const char* system_directory, const char* filename, int dbg)
DiamDict_lex(scanner);
DiamDict_lex_destroy(scanner);
- fclose(in);
+ /*
+ * XXX - can the lexical analyzer terminate without closing
+ * all open input files?
+ */
D(("\n---------------\n%s\n------- %u -------\n",state.strbuf,state.len_strbuf));
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 86a8428f07..656086e59e 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -708,8 +708,10 @@ gboolean radius_load_dictionary (radius_dictionary_t* d, gchar* dir, const gchar
Radius_lex(scanner);
Radius_lex_destroy(scanner);
-
- fclose(in);
+ /*
+ * XXX - can the lexical analyzer terminate without closing
+ * all open input files?
+ */
for (i = 0; i < MAX_INCLUDE_DEPTH; i++) {
if (state.fullpaths[i])