summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-10-05 11:43:32 +0200
committerMichael Mann <mmann78@netscape.net>2015-10-05 12:14:01 +0000
commit32f872cbb38da07cd4e128c699777efae6bb1e09 (patch)
tree1df78001112aa0dfabc661e27dfdc9d4924e8437 /file.c
parent4fbfd3eca5f092a3319bfbd3cc07e6f0caf40a36 (diff)
downloadwireshark-32f872cbb38da07cd4e128c699777efae6bb1e09.tar.gz
file.c: fix resource leak reported by Coverity (CID 1159387)
Change-Id: I24f85f41bcb0c3a0dda0b6658dbfdb4098eb64b9 Reviewed-on: https://code.wireshark.org/review/10796 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index c97194f6e9..dfe73e9c43 100644
--- a/file.c
+++ b/file.c
@@ -1395,7 +1395,6 @@ cf_merge_files(char **out_filenamep, int in_file_count,
case MERGE_ERR_CANT_OPEN_OUTFILE:
cf_open_failure_alert_box(out_filename, err, err_info, TRUE,
file_type);
- ws_close(out_fd);
break;
case MERGE_ERR_CANT_READ_INFILE: /* fall through */
@@ -1408,6 +1407,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
}
g_free(err_info);
+ ws_close(out_fd);
if (status != MERGE_OK) {
/* Callers aren't expected to treat an error or an explicit abort