diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | user/win32/userinfo.c | 27 |
2 files changed, 22 insertions, 8 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes for APR 2.0.0 + *) Fix handle leak in the Win32 apr_uid_current implementation. + PR 61165. [Ivan Zhakov] + *) apr_rwlock_t: Use native Slim Reader/Writer (SRW) locks on Windows. PR 51360. [Ivan Zhakov] diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c index c6b5084a5..89f9b8cf0 100644 --- a/user/win32/userinfo.c +++ b/user/win32/userinfo.c @@ -171,27 +171,38 @@ APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid, DWORD needed; TOKEN_USER *usr; TOKEN_PRIMARY_GROUP *grp; - + apr_status_t rv; + if(!OpenProcessToken(GetCurrentProcess(), STANDARD_RIGHTS_READ | READ_CONTROL | TOKEN_QUERY, &threadtok)) { return apr_get_os_error(); } *uid = NULL; if (!GetTokenInformation(threadtok, TokenUser, NULL, 0, &needed) - && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (usr = apr_palloc(p, needed)) - && GetTokenInformation(threadtok, TokenUser, usr, needed, &needed)) + && GetTokenInformation(threadtok, TokenUser, usr, needed, &needed)) { *uid = usr->User.Sid; - else - return apr_get_os_error(); + } + else { + rv = apr_get_os_error(); + CloseHandle(threadtok); + return rv; + } if (!GetTokenInformation(threadtok, TokenPrimaryGroup, NULL, 0, &needed) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (grp = apr_palloc(p, needed)) - && GetTokenInformation(threadtok, TokenPrimaryGroup, grp, needed, &needed)) + && GetTokenInformation(threadtok, TokenPrimaryGroup, grp, needed, &needed)) { *gid = grp->PrimaryGroup; - else - return apr_get_os_error(); + } + else { + rv = apr_get_os_error(); + CloseHandle(threadtok); + return rv; + } + + CloseHandle(threadtok); return APR_SUCCESS; #endif |