summaryrefslogtreecommitdiffstats
path: root/match.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-04-15 20:03:56 -0700
committerKaz Kylheku <kaz@kylheku.com>2016-04-15 20:03:56 -0700
commitf200086eff39c729cbdbb5dbdcb97b134f3fdd0d (patch)
tree66d1853e84c8ed28a6fff176eb401db8cb6d5372 /match.c
parent50b5651649f71c7f1e4c480504b61cea04d8f789 (diff)
downloadtxr-f200086eff39c729cbdbb5dbdcb97b134f3fdd0d.tar.gz
txr-f200086eff39c729cbdbb5dbdcb97b134f3fdd0d.tar.bz2
txr-f200086eff39c729cbdbb5dbdcb97b134f3fdd0d.zip
Close source files after parsing.
* eval.c (sys_load): close stream in all cases. * match.c (v_load): Likewise. * parser.c (load_rcfile): Close stream in unwind block, if open. * txr.c (txr_main): Close stream after parsing in all cases. If stream is std_input, or a string stream, close_stream does nothing.
Diffstat (limited to 'match.c')
-rw-r--r--match.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/match.c b/match.c
index 05b1a094..857e1df6 100644
--- a/match.c
+++ b/match.c
@@ -3739,6 +3739,8 @@ static val v_load(match_files_ctx *c)
parse_once(stream, name, &parser);
gc_state(gc);
+ close_stream(stream, nil);
+
if (parser.errors)
sem_error(specline, lit("~s: errors encountered in ~s"), sym, path, nao);
@@ -3773,8 +3775,11 @@ static val v_load(match_files_ctx *c)
}
}
} else {
- if (!read_eval_stream(stream, std_error, nil))
+ if (!read_eval_stream(stream, std_error, nil)){
+ close_stream(stream, nil);
sem_error(specline, lit("load: ~s contains errors"), path, nao);
+ }
+ close_stream(stream, nil);
return (sym == include_s) ? nil : next_spec_k;
}
}