osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Do not leak C run-time handles on Windows 

The _open_osfhandle() does take ownership of the handle and thus the
underlying handle gets closed at the same time as the file-descriptor.
As we want to preserve the underlying pipe handle, create a duplicate
handle and use the duplicate handle with _open_osfhandle().

Change-Id: Iaa52fbae8e72b1ba74ab8ea9a44def8dc2ab4570
Reviewed-on: https://code.wireshark.org/review/33251
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Tomasz Moń 2019-05-20 19:17:57 +02:00 committed by Peter Wu
parent 41813ba202
commit c4f0b500eb
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/qt/interface_toolbar.cpp
View File

@ -22,6 +22,11 @@
#include "sync_pipe.h"
#include "wsutil/file_util.h"
#include "log.h"
#ifdef _WIN32
#include <wsutil/win32-utils.h>
#endif
#include <QCheckBox>
#include <QComboBox>
#include <QDesktopServices>
@ -746,7 +751,22 @@ void InterfaceToolbar::startCapture(GArray *ifaces)
// Open control out channel
#ifdef _WIN32
startReaderThread(ifname, interface_opts->extcap_control_in_h);
interface_[ifname].out_fd = _open_osfhandle((intptr_t)interface_opts->extcap_control_out_h, O_APPEND | O_BINARY);
// Duplicate control out handle and pass the duplicate handle to _open_osfhandle().
// This allows the C run-time file descriptor (out_fd) and the extcap_control_out_h to be closed independently.
// The duplicated handle will get closed at the same time the file descriptor is closed.
// The control out pipe will close when both out_fd and extcap_control_out_h are closed.
HANDLE duplicate_out_handle = INVALID_HANDLE_VALUE;
if (!DuplicateHandle(GetCurrentProcess(), interface_opts->extcap_control_out_h,
GetCurrentProcess(), &duplicate_out_handle, 0, TRUE, DUPLICATE_SAME_ACCESS))
{
simple_dialog_async(ESD_TYPE_ERROR, ESD_BTN_OK,
"Failed to duplicate extcap control out handle: %s\n.",
win32strerror(GetLastError()));
}
else
{
interface_[ifname].out_fd = _open_osfhandle((intptr_t)duplicate_out_handle, O_APPEND | O_BINARY);
}
#else
startReaderThread(ifname, interface_opts->extcap_control_in);
interface_[ifname].out_fd = ws_open(interface_opts->extcap_control_out, O_WRONLY | O_BINARY, 0);
@ -780,9 +800,7 @@ void InterfaceToolbar::stopCapture()
if (interface_[ifname].out_fd != -1)
{
#ifndef _WIN32
ws_close (interface_[ifname].out_fd);
#endif
interface_[ifname].out_fd = -1;
}