wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Zebediah Figura : setupapi: Avoid leaking subKey in SETUPDI_AddDeviceInterfaces().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 39d328e958faf7a685693c8635ff57b2ebdaaa25 URL: https://gitlab.winehq.org/wine/wine/-/commit/39d328e958faf7a685693c8635ff57… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 16:18:20 2022 -0500 setupapi: Avoid leaking subKey in SETUPDI_AddDeviceInterfaces(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 93d8a86ce22c0295219cd709eecdee871c37f4b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ecc0b58ca5c..34beae23bdc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2281,8 +2281,8 @@ static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, (BYTE *)symbolicLink, &len); if (!l && dataType == REG_SZ) SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); - RegCloseKey(subKey); } + RegCloseKey(subKey); } } /* Allow enumeration to continue */

1 0

Alex Henrie : winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 542d9a925d66caff063fc28ee83747f519f8b5bb URL: https://gitlab.winehq.org/wine/wine/-/commit/542d9a925d66caff063fc28ee83747… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 21:35:01 2022 -0700 winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5a12c6a481c157a299821cb85874819c181081a4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 971eb654e6a..52edd362622 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1775,7 +1775,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, WCHAR *outputW; ret = DeviceCapabilitiesW(device_name, port, cap, NULL, devmode); - if (ret == -1) return ret; + if (ret == -1) goto cleanup; switch (cap) { case DC_BINNAMES: @@ -1795,6 +1795,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, } else { ret = DeviceCapabilitiesW(device_name, port, cap, (WCHAR *)output, devmode); } +cleanup: HeapFree(GetProcessHeap(), 0, device_name); HeapFree(GetProcessHeap(), 0, devmode); HeapFree(GetProcessHeap(), 0, port);

1 0

Alex Henrie : sane: Fix memory leak in create_item (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 42a167cdce40568de980323b7edafb1286ff83ba URL: https://gitlab.winehq.org/wine/wine/-/commit/42a167cdce40568de980323b7edafb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 21:35:00 2022 -0700 sane: Fix memory leak in create_item (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 746b5bbd50c6041f19c3810b7fb20d762ac9e15f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sane.ds/ui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 8be7ed42b70..e66526a088e 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -318,6 +318,7 @@ static int create_item(HDC hdc, const struct option_descriptor *opt, if (trail_edit) *count+=1; + free(trail_edit); return leading_len + local_len + padding + padding2 + trail_len; }

1 0

Alex Henrie : ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 8858479b5c4673540ca6ff4317f56c3a3e0e999f URL: https://gitlab.winehq.org/wine/wine/-/commit/8858479b5c4673540ca6ff4317f56c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:19 2022 -0700 ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6daef74f67690372e7bde377dffa0db63b25d9f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/unixlib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 56a0bed308d..0625c5c72ce 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -865,9 +865,9 @@ static NTSTATUS unix_gethostbyaddr( void *args ) } if (!unix_host) - return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); - - ret = hostent_from_unix( unix_host, params->host, params->size ); + ret = (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + else + ret = hostent_from_unix( unix_host, params->host, params->size ); free( unix_buffer ); return ret; @@ -915,9 +915,9 @@ static NTSTATUS unix_gethostbyname( void *args ) } if (!unix_host) - return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); - - ret = hostent_from_unix( unix_host, params->host, params->size ); + ret = (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + else + ret = hostent_from_unix( unix_host, params->host, params->size ); free( unix_buffer ); return ret;

1 0

Alex Henrie : ws2_32: Fix memory leak on error path in get_local_ips (cppcheck).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e4fc629062039cc20a75b1d3f368a4d772d0ea84 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4fc629062039cc20a75b1d3f368a4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:18 2022 -0700 ws2_32: Fix memory leak on error path in get_local_ips (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 978df2e0310f0950e51f0cdf3e45fde546ea7cf0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/protocol.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 867e9513ca2..56b7379cccc 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -806,7 +806,7 @@ static struct hostent *get_local_ips( char *hostname ) IP_ADAPTER_INFO *adapters = NULL, *k; struct hostent *hostlist = NULL; MIB_IPFORWARDTABLE *routes = NULL; - struct route *route_addrs = NULL; + struct route *route_addrs = NULL, *new_route_addrs; DWORD adap_size, route_size, n; /* Obtain the size of the adapter list and routing table, also allocate memory */ @@ -852,9 +852,10 @@ static struct hostent *get_local_ips( char *hostname ) } if (exists) continue; - route_addrs = realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); - if (!route_addrs) + new_route_addrs = realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); + if (!new_route_addrs) goto cleanup; + route_addrs = new_route_addrs; route_addrs[numroutes].interface = ifindex; route_addrs[numroutes].metric = ifmetric; route_addrs[numroutes].default_route = ifdefault;

1 0

Alex Henrie : dbghelp: Fix memory leak on error path in dwarf2_read_range (cppcheck).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 19f3ef9123997e1d8cc01ffd4b99b54d2f46e6b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/19f3ef9123997e1d8cc01ffd4b99b5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:13 2022 -0700 dbghelp: Fix memory leak on error path in dwarf2_read_range (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 950792ae2b60d82ed101baa00b7bcc0dd9ba4ad8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7472b6070e6..fc88b741a56 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1289,6 +1289,7 @@ static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsig { struct attribute range; struct addr_range* ranges; + struct addr_range* new_ranges; if (dwarf2_find_attribute(di, DW_AT_ranges, &range)) { @@ -1312,8 +1313,13 @@ static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsig if (*num_ranges >= alloc) { alloc *= 2; - ranges = realloc(ranges, sizeof(struct addr_range) * alloc); - if (!ranges) return NULL; + new_ranges = realloc(ranges, sizeof(struct addr_range) * alloc); + if (!new_ranges) + { + free(ranges); + return NULL; + } + ranges = new_ranges; } ranges[*num_ranges].low = di->unit_ctx->compiland->address + low; ranges[*num_ranges].high = di->unit_ctx->compiland->address + high;

1 0

Alex Henrie : conhost: Fix memory leak on error path in create_screen_buffer (cppcheck).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 67d961acfd16421be7eba4bc7a006bf8004f8d10 URL: https://gitlab.winehq.org/wine/wine/-/commit/67d961acfd16421be7eba4bc7a006b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:12 2022 -0700 conhost: Fix memory leak on error path in create_screen_buffer (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 78df9cb96ccf7d5f2e7919a003209c0b6f6fe021) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/conhost.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 78f6e345170..3c8d165cbbe 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -100,7 +100,11 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (screen_buffer->font.face_len) { screen_buffer->font.face_name = malloc( screen_buffer->font.face_len * sizeof(WCHAR) ); - if (!screen_buffer->font.face_name) return NULL; + if (!screen_buffer->font.face_name) + { + free( screen_buffer ); + return NULL; + } memcpy( screen_buffer->font.face_name, console->active->font.face_name, screen_buffer->font.face_len * sizeof(WCHAR) );

1 0

Alex Henrie : adsldp: Fix memory leak on error path in search_ExecuteSearch (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 0344482cf4570088f103bf0c7a375491dd475f4d URL: https://gitlab.winehq.org/wine/wine/-/commit/0344482cf4570088f103bf0c7a3754… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:11 2022 -0700 adsldp: Fix memory leak on error path in search_ExecuteSearch (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 36af68289546d942759539acf65b35a9acf43b85) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/adsldp/adsldp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 3d5ea29882c..c8f63a25e0c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1302,7 +1302,11 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = NULL; else { - if (count && !names) return E_ADS_BAD_PARAMETER; + if (count && !names) + { + heap_free(ldap_ctx); + return E_ADS_BAD_PARAMETER; + } props = heap_alloc((count + 1) * sizeof(props[0])); if (!props)

1 0

Alex Henrie : winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e74125c4bac1ae60a916cd3dd48e66042dae721e URL: https://gitlab.winehq.org/wine/wine/-/commit/e74125c4bac1ae60a916cd3dd48e66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:17 2022 -0700 winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity). And use a single variable for the encoded or decoded URL so that free only has to be called once. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b63fdd9a5fb58951e90af877f79c0a65bd445ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/url.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 0d9dfb76de6..8efd5ed0c49 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -172,7 +172,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { - WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; @@ -189,25 +189,26 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) { - if ((err = escape_url( url, &len, &url_escaped ))) + if ((err = escape_url( url, &len, &url_transformed ))) { SetLastError( err ); return FALSE; } - url = url_escaped; + url = url_transformed; } else if (flags & ICU_DECODE) { - if (!(url_decoded = decode_url( url, &len ))) + if (!(url_transformed = decode_url( url, &len ))) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - url = url_decoded; + url = url_transformed; } if (!(p = wcschr( url, ':' ))) { SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + free( url_transformed ); return FALSE; } if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; @@ -331,8 +332,7 @@ exit: if (overflow) err = ERROR_INSUFFICIENT_BUFFER; uc->nScheme = scheme_number; } - free( url_decoded ); - free( url_escaped ); + free( url_transformed ); SetLastError( err ); return !err; }

1 0

Alex Henrie : msi: Fix memory leak in get_fusion_filename (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 0602943f849a8b4d905e54d1e6cd7de3162ab3db URL: https://gitlab.winehq.org/wine/wine/-/commit/0602943f849a8b4d905e54d1e6cd7d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:14 2022 -0700 msi: Fix memory leak in get_fusion_filename (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ad90181e1407bc4ffe81e55f07f83b23c09cccb8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..596affbaae4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -553,6 +553,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + lstrlenW(L"fusion.dll") + 3; + msi_free(filename); if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022