diff options
author | Mikael Kanstrup <mikael.kanstrup@gmail.com> | 2017-06-30 15:16:25 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-07-01 01:24:44 +0000 |
commit | f9fd438b6d8d5fb535881e94f736025b46a3fcc4 (patch) | |
tree | 63c4abf7926d1b8ba711cf7bda8849aad1e40f5e /extcap | |
parent | 91e512985fac3f58986a8fdc322bcaf02f5e3685 (diff) | |
download | wireshark-f9fd438b6d8d5fb535881e94f736025b46a3fcc4.tar.gz wireshark-f9fd438b6d8d5fb535881e94f736025b46a3fcc4.tar.bz2 wireshark-f9fd438b6d8d5fb535881e94f736025b46a3fcc4.zip |
androiddump: Close socket on failure path
Fix a few cases where socket is not closed on failure path.
Change-Id: Id116a8e5f14979f962fdf725c62999758b79109e
Reviewed-on: https://code.wireshark.org/review/22481
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'extcap')
-rw-r--r-- | extcap/androiddump.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 3e65902f6b..9407b38e6f 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -2393,6 +2393,7 @@ static int capture_android_tcpdump(char *interface, char *fifo, regex = g_regex_new(regex_linktype, (GRegexCompileFlags)0, (GRegexMatchFlags)0, &err); if (!regex) { g_warning("Failed to compile regex for tcpdump data link type matching"); + closesocket(sock); return EXIT_CODE_GENERIC; } @@ -2409,6 +2410,7 @@ static int capture_android_tcpdump(char *interface, char *fifo, } else if (errno != 0) { g_warning("ERROR capture: %s", strerror(errno)); + closesocket(sock); g_regex_unref(regex); return EXIT_CODE_GENERIC; } @@ -2546,6 +2548,7 @@ static int capture_android_tcpdump(char *interface, char *fifo, } else if (errno != 0) { g_warning("ERROR capture: %s", strerror(errno)); + closesocket(sock); return EXIT_CODE_GENERIC; } |