wsutil: introduce ws_pipe_close() helper and use it to terminate mmdbresolve

We were not calling TerminateProcess() to stop mmdbresolve.Exe process on
Windows.

Bug: 15248
Change-Id: Ic90cf438a8003a6fefb023b7056984681ce09b46
Reviewed-on: https://code.wireshark.org/review/30449
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/extcap.c b/extcap.c
index 7c65267fc9..7b468be5f8 100644
--- a/extcap.c
+++ b/extcap.c
@@ -1199,10 +1199,7 @@ void extcap_if_cleanup(capture_options *capture_opts, gchar **errormsg)
 
         if (interface_opts->extcap_pid != WS_INVALID_PID)
         {
-#ifdef _WIN32
-            TerminateProcess(interface_opts->extcap_pid, 0);
-#endif
-            g_spawn_close_pid(interface_opts->extcap_pid);
+            ws_pipe_close((ws_pipe_t *) interface_opts->extcap_pipedata);
             interface_opts->extcap_pid = WS_INVALID_PID;
 
             g_free(interface_opts->extcap_pipedata);