From 25de063ec0a3ac94f90c2c8a2d5722444e591452 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Sun, 30 Apr 2017 22:25:52 +0300 Subject: [PATCH] dpnet/tests: Fix free buffer access (Coverity). Signed-off-by: Nikolay Sivov Signed-off-by: Alistair Leslie-Hughes Signed-off-by: Alexandre Julliard --- dlls/dpnet/tests/client.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index e11bfe3c26a..431203b9242 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -210,13 +210,13 @@ static void test_enum_service_providers(void) trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); - /* Invalid GUID */ items = 88; hr = IDirectPlay8Client_EnumServiceProviders(client, &appguid, NULL, serv_prov_info, &size, &items, 0); ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); } static void test_enum_hosts(void) @@ -613,14 +613,11 @@ static void test_enum_service_providers_peer(void) for (i=0;ipwszName)); - trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); - - serv_prov_info++; + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - serv_prov_info -= items; /* set pointer back */ - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + HeapFree(GetProcessHeap(), 0, serv_prov_info); size = 0; items = 0; @@ -638,20 +635,17 @@ static void test_enum_service_providers_peer(void) for (i=0;ipwszName)); - trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); - - serv_prov_info++; + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - serv_prov_info -= items; /* set pointer back */ - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); - /* Invalid GUID */ items = 88; hr = IDirectPlay8Peer_EnumServiceProviders(peer, &appguid, NULL, serv_prov_info, &size, &items, 0); ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); } static void test_enum_hosts_peer(void) -- 2.11.4.GIT