Module: wine Branch: master Commit: 866cb1ca6382f2b7bbc44ecf167bf12415a586e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/866cb1ca6382f2b7bbc44ecf167bf12...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Thu Mar 14 13:12:01 2024 +0100
wshom/network: Check pointer argument in get_UserName().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com
---
dlls/wshom.ocx/network.c | 3 +++ dlls/wshom.ocx/tests/wshom.c | 3 +++ 2 files changed, 6 insertions(+)
diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index ef7f5e52808..f2a88c2117f 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -126,6 +126,9 @@ static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_n
TRACE("%p, %p.\n", iface, user_name);
+ if (!user_name) + return E_POINTER; + GetUserNameW(NULL, &len); *user_name = SysAllocStringLen(NULL, len-1); if (!*user_name) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 3e124b218c6..ed0f4e186a3 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -710,6 +710,9 @@ static void test_wshnetwork(void) hr = IDispatch_QueryInterface(disp, &IID_IWshNetwork2, (void**)&nw2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+ hr = IWshNetwork2_get_UserName(nw2, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + str = NULL; hr = IWshNetwork2_get_UserName(nw2, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);