Module: wine Branch: master Commit: b95cc688944fc9eacf5bd3a0ef30e78c2d0188b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95cc688944fc9eacf5bd3a0e...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Aug 26 12:46:18 2021 +0200
dpnet: Fix short buffer check also for the A case.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dpnet/address.c | 3 --- dlls/dpnet/tests/address.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7216576dbf1..d7e802f8106 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -326,10 +326,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface return DPNERR_INVALIDPOINTER;
if(url && *length) - { - url[0] = '\0'; buffer = heap_alloc(*length * sizeof(WCHAR)); - }
hr = IDirectPlay8Address_GetURLW(iface, buffer, length); if(hr == DPN_OK) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index b3ab80f2b3c..fe17cfde52d 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -400,9 +400,10 @@ static void address_urlA(void) ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr);
bufflen2 = bufflen/2; + memset( buffer, 0x55, sizeof(buffer) ); hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); - ok(!strlen(buffer), "wrong length\n"); + ok(buffer[0] == 0x55, "buffer modified\n");
hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); ok(hr == S_OK, "got 0x%08x\n", hr);