extcap: Fix Dereference of null pointer

Change-Id: I03098de9bd8684953a4fe024a3e6b604eeecf03f
Reviewed-on: https://code.wireshark.org/review/17066
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 5ebfbf4fec09b0c316d97a339733af7379c73398)
Reviewed-on: https://code.wireshark.org/review/17073

1 files changed, 8 insertions, 11 deletions

diff --git a/extcap.c b/extcap.c
index 198835f975..b2ca65e729 100644
--- a/extcap.c
+++ b/extcap.c
@@ -758,21 +758,18 @@ void extcap_if_cleanup(capture_options * capture_opts, gchar ** errormsg) {
                 }
                 g_free(buffer);
             }
-        }
 
 #ifndef _WIN32
-        /* Final child watch may not have been called */
-        if ( interface_opts.extcap_child_watch != 0 )
-        {
-            extcap_child_watch_cb(userdata->pid, 0, capture_opts);
-            /* it will have changed in extcap_child_watch_cb */
-            interface_opts = g_array_index(capture_opts->ifaces, interface_options,
-                            icnt);
-        }
+            /* Final child watch may not have been called */
+            if ( interface_opts.extcap_child_watch != 0 )
+            {
+                extcap_child_watch_cb(userdata->pid, 0, capture_opts);
+                /* it will have changed in extcap_child_watch_cb */
+                interface_opts = g_array_index(capture_opts->ifaces, interface_options,
+                                icnt);
+            }
 #endif
 
-        if ( userdata )
-        {
             if ( userdata->extcap_stderr != NULL )
                 overwrite_exitcode = TRUE;