diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-04-29 04:28:53 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-04-29 11:29:34 +0000 |
commit | 2a3f1a4f6724c061f47a0266e157e6d84aa65c7d (patch) | |
tree | bdb778c127d6cb73751c7bfc2766a6ba1cecac0d /mergecap.c | |
parent | e3f49280deb11a7055083634fbbc4d8416fce024 (diff) |
Eliminate some double-frees.
The cfile_ error-reporting routines free err_info; the caller doesn't
have to and, in fact, mustn't do so themselves.
While we're at it, make sure wtap_seek_read() always zeroes out *err and
nulls out *err_info, so the latter either points to a freshly-allocated
string or is null.
Change-Id: Idfe05a3ba2fbf2647ba14e483187617ee53e3c69
Reviewed-on: https://code.wireshark.org/review/21407
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'mergecap.c')
-rw-r--r-- | mergecap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index cac00af45e..e696c0042f 100644 --- a/mergecap.c +++ b/mergecap.c @@ -494,8 +494,6 @@ main(int argc, char *argv[]) break; } - g_free(err_info); - clean_exit: wtap_cleanup(); free_progdirs(); |