From: Pali Rohár Date: Wed, 28 Feb 2024 00:06:38 +0000 (+0100) Subject: windows: Correctly propagate error code from win32_call_func_with_tcb_privilege() X-Git-Tag: v3.13.0~26 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=90251023d44d50973e956d308b29a53ae84668e3;p=pciutils.git windows: Correctly propagate error code from win32_call_func_with_tcb_privilege() Cleanup phase may change error code as it calls other WinAPI functions. --- diff --git a/lib/win32-helpers.c b/lib/win32-helpers.c index d370d5c..5338efa 100644 --- a/lib/win32-helpers.c +++ b/lib/win32-helpers.c @@ -1227,6 +1227,7 @@ win32_call_func_with_tcb_privilege(BOOL (*function)(LPVOID), LPVOID argument) HANDLE lsass_process; HANDLE lsass_token; + DWORD error; BOOL ret; impersonate_privilege_enabled = FALSE; @@ -1374,6 +1375,8 @@ err_privilege_not_held: goto ret; ret: + error = GetLastError(); + if (revert_to_old_token) win32_revert_to_token(old_token); @@ -1383,5 +1386,7 @@ ret: if (lsass_token) CloseHandle(lsass_token); + SetLastError(error); + return ret; }