[PATCH 0/2] MR8186: winebth.sys, bluetoothapis: Minor memory related fixes.

[Vibhav Pant (＠vibhavp)]

Fix an incorrect decref in the winebth.sys DBus code leading to memory corruption, and a potential HANDLE leak in bluetoothapis.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8186

[PATCH 1/2] winebth.sys: Don't decrement the reference count for the DBusPendingCall received by bluez_device_pair_callback.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/winebth.sys/dbus.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/winebth.sys/dbus.c b/dlls/winebth.sys/dbus.c
index 3c0c21460fd..8b24ea25605 100644
--- a/dlls/winebth.sys/dbus.c
+++ b/dlls/winebth.sys/dbus.c
@@ -1295,7 +1295,6 @@ static void bluez_device_pair_callback( DBusPendingCall *pending, void *param )
     bluez_event_list_queue_new_event( &data->watcher_ctx->event_list,
                                       BLUETOOTH_WATCHER_EVENT_TYPE_PAIRING_FINISHED, event );
     p_dbus_message_unref( reply );
-    p_dbus_pending_call_unref( pending );
 }
 
 NTSTATUS bluez_device_start_pairing( void *connection, void *watcher_ctx, struct unix_name *device, IRP *irp )
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8186

[PATCH 2/2] bluetoothapis: Fix a potential handle leak in BluetoothAuthenticateDeviceEx.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/bluetoothapis/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c
index d18306d1f58..a77f1a688e4 100644
--- a/dlls/bluetoothapis/main.c
+++ b/dlls/bluetoothapis/main.c
@@ -1151,8 +1151,8 @@ DWORD WINAPI BluetoothAuthenticateDeviceEx( HWND parent, HANDLE handle_radio, BL
         ret = GetLastError();
         if (ret == ERROR_IO_PENDING)
             ret = GetOverlappedResult( handle_radio, &ovl, &bytes, TRUE );
-        CloseHandle( ovl.hEvent );
     }
+    CloseHandle( ovl.hEvent );
 
     return ret;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8186

[Jinoh Kang (＠iamahuman)]

Jinoh Kang (@iamahuman) commented about dlls/bluetoothapis/main.c:
> if (ret)
>          {
>              ReleaseSRWLockExclusive( &bluetooth_auth_lock );
>              return ret;

You're missing CloseHandle(ovl.hEvent) here.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8186#note_105052

[Jinoh Kang (＠iamahuman)]

Jinoh Kang (@iamahuman) commented about dlls/bluetoothapis/main.c:
> if (!listener)
>          {
>              ReleaseSRWLockExclusive( &bluetooth_auth_lock );
>              return ERROR_OUTOFMEMORY;

Ditto

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8186#note_105053