Sven Baars : setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind).

Alexandre Julliard julliard at winehq.org
Fri Aug 7 10:42:30 CDT 2020


Module: wine
Branch: stable
Commit: 20285f03434584536e9453f42e6407abb3524158
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=20285f03434584536e9453f42e6407abb3524158

Author: Sven Baars <sbaars at codeweavers.com>
Date:   Fri Apr 17 20:20:11 2020 +0200

setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind).

Signed-off-by: Sven Baars <sbaars at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit b08974900f5855f548ab36b43049bec158bd7a2d)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/setupapi/devinst.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index b2bdc4b4d9..8969abd8ee 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -4642,7 +4642,8 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat
 
     driver_dataW.cbSize = sizeof(driver_dataW);
     ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW);
-    driver_data_wtoa(driver_data, &driver_dataW);
+    if (ret) driver_data_wtoa(driver_data, &driver_dataW);
+
     return ret;
 }
 




More information about the wine-cvs mailing list