diff options
| author | Tomasz Moń <desowin@gmail.com> | 2019-04-25 17:17:36 +0200 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-04-25 16:03:53 +0000 |
| commit | 66f829bc1803df0f4518a98a57a604a05beee6f6 (patch) | |
| tree | d1a363cf751c3e2d443fc6422e2abbf9ce7016fe | |
| parent | 504da93d16784500de996f3b2489b188d0d4eeeb (diff) | |
| download | wireshark-66f829bc1803df0f4518a98a57a604a05beee6f6.tar.gz wireshark-66f829bc1803df0f4518a98a57a604a05beee6f6.tar.bz2 wireshark-66f829bc1803df0f4518a98a57a604a05beee6f6.zip | |
win32-utils: Do not share job between Wireshark instances
Creating Job Object named "Local\Wireshark child process cleanup"
results in the job being shared between all Wireshark instances run
within a single session.
When two or more Wireshark instances were running, debug message appeared:
"Could not assign child cleanup process: Access is denied. (5)"
As the child process was not assigned to a job, it was possible that the
child process was still active even after Wireshark did terminate.
This fixes the issue by creating unnamed job object which is not shared.
Change-Id: I59adc2aacff0151802163f155d68cbc8022c1479
Reviewed-on: https://code.wireshark.org/review/32985
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | wsutil/win32-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wsutil/win32-utils.c b/wsutil/win32-utils.c index 3850868e80..d9f352d9a8 100644 --- a/wsutil/win32-utils.c +++ b/wsutil/win32-utils.c @@ -196,7 +196,7 @@ win32strexception(DWORD exception) static void win32_kill_child_on_exit(HANDLE child_handle) { static HANDLE cjo_handle = NULL; if (!cjo_handle) { - cjo_handle = CreateJobObject(NULL, _T("Local\\Wireshark child process cleanup")); + cjo_handle = CreateJobObject(NULL, NULL); if (!cjo_handle) { g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "Could not create child cleanup job object: %s", |