December 2021 - Wine-devel - list.winehq.org

[PATCH] nsiproxy: Fix use after free in icmp_send_echo (scan-build)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/nsiproxy.sys/icmp_echo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index cfebb287547..f36ff156bef 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -656,8 +656,8 @@ NTSTATUS icmp_send_echo( void *args ) if (ret < 0) { TRACE( "sendto() rets %d errno %d\n", ret, errno ); - icmp_data_free( data ); params->reply_len = data->ops->set_reply_ip_status( errno_to_ip_status( errno ), params->bits, params->reply ); + icmp_data_free( data ); return STATUS_SUCCESS; } -- 2.34.1

2 1

[PATCH] ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ws2_32/unixlib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..45018199add 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -865,12 +865,13 @@ static NTSTATUS unix_gethostbyaddr( void *args ) unix_buffer = new_buffer; } + free( unix_buffer ); + 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 ); - free( unix_buffer ); return ret; } #else @@ -915,12 +916,13 @@ static NTSTATUS unix_gethostbyname( void *args ) unix_buffer = new_buffer; } + free( unix_buffer ); + 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 ); - free( unix_buffer ); return ret; } #else -- 2.34.1

2 1

[PATCH] ntdll: Fix memory leak on error path in NtCreateFile (scan-build)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 07bfa6c22c4..a3437099872 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3785,9 +3785,9 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU { status = open_unix_file( handle, unix_name, access, &new_attr, attributes, sharing, disposition, options, ea_buffer, ea_length ); - free( unix_name ); } else WARN( "%s not found (%x)\n", debugstr_us(attr->ObjectName), status ); + free( unix_name ); if (status == STATUS_SUCCESS) { -- 2.34.1

2 1

[PATCH] ntdll: Remove extra call to getenv from virtual_init (scan-build)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1f817cd977d..4ea33a2ef87 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2647,7 +2647,7 @@ static int alloc_virtual_heap( void *base, SIZE_T size, void *arg ) void virtual_init(void) { const struct preload_info **preload_info = dlsym( RTLD_DEFAULT, "wine_main_preload_info" ); - const char *preload = getenv( "WINEPRELOADRESERVE" ); + const char *preload; struct alloc_virtual_heap alloc_views; size_t size; int i; -- 2.34.1

1 0

[PATCH] wlap32: Fix memory leak on error path in create_page_control (cppcheck)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wldap32/page.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 8b0ded40e35..9f4acbdaa16 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -96,6 +96,7 @@ static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR c } if (!(ctrl->ldctl_oid = strAtoW( LDAP_PAGED_RESULT_OID_STRING ))) { + free( val ); free( ctrl ); return LDAP_NO_MEMORY; } -- 2.34.1

1 0

[PATCH] dbghelp: Fix memory leak on error path in dwarf2_read_range (cppcheck)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- 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 7515e540778..e086de1565e 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; -- 2.34.1

1 0

[PATCH] conhost: Fix memory leak on error path in create_screen_buffer (cppcheck)
by Alex Henrie 21 Dec '21

21 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- 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) ); -- 2.34.1

1 0

[PATCH] mshtml: Avoid null pointer dereference in OmHistory_get_length (cppcheck)
by Alex Henrie 20 Dec '21

20 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/omnavigator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 70e8e568661..7788b453b8d 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -674,7 +674,7 @@ static HRESULT WINAPI OmHistory_get_length(IOmHistory *iface, short *p) if(This->window && This->window->base.outer_window) browser = This->window->base.outer_window->browser; - *p = browser->doc->travel_log + *p = browser && browser->doc->travel_log ? ITravelLog_CountEntries(browser->doc->travel_log, browser->doc->browser_service) : 0; return S_OK; -- 2.34.1

2 1

[PATCH] winebus.sys: Declare a variable only when used
by Gerald Pfeifer 20 Dec '21

20 Dec '21

One step towards a world with fewer warnings (GCC 12). -- udev_add_device declares a variable (product) even when it is not used on all platforms. Use the same condition for the declaration as for the code. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/winebus.sys/bus_udev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2269f5b904e..d3e060bf631 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1245,7 +1245,9 @@ static void udev_add_device(struct udev_device *dev, int fd) if (!strcmp(subsystem, "hidraw")) { static const WCHAR hidraw[] = {'h','i','d','r','a','w',0}; +#ifdef HAVE_LINUX_HIDRAW_H char product[MAX_PATH]; +#endif if (!desc.manufacturer[0]) memcpy(desc.manufacturer, hidraw, sizeof(hidraw)); -- 2.32.0

1 0

[PATCH] msvcrt: support I width modifier in *scanf* family
by Eric Pouech 20 Dec '21

20 Dec '21

Despite what msdn states, I and I32 are supported width modifiers. V2: - better code structure - added support and tests for I32 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/msvcrt/tests/scanf.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e175342796b..6541f5fd5cb 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -74,6 +74,7 @@ static void test_sscanf( void ) int hour=21,min=59,sec=20; int number,number_so_far; HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + DWORD_PTR result_ptr; p_sprintf = (void *)GetProcAddress( hmod, "sprintf" ); p_sscanf = (void *)GetProcAddress( hmod, "sscanf" ); @@ -264,6 +265,51 @@ static void test_sscanf( void ) if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + strcpy(buffer,"12345678901234"); + ret = p_sscanf(buffer, "%I64d", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = p_sprintf(buffer1, "%I64d", result64); + ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + + result = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%I32x", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0x23456789, "got %x, expected 0x23456789\n", result); + + result_ptr = 0; + strcpy(buffer,"0x87654321"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + if (sizeof(void*) == sizeof(LONGLONG)) + { + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==9, "sprintf returned %d\n", ret); + if(ret == 9) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + } + else + { + ok(result_ptr == 0x87654321, "got %x, expected 0x23456789\n", result); + } + result_ptr = 0; + strcpy(buffer,"0x123456789"); + ret = p_sscanf(buffer, "%Ix", &result_ptr); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + if (sizeof(void*) == sizeof(LONGLONG)) + { + ret = p_sprintf(buffer1, "%#Ix", result_ptr); + ok(ret==11, "sprintf returned %d\n", ret); + if(ret == 11) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + } + else + { + ok(result_ptr == 0x23456789, "got %x, expected 0x23456789\n", result); + } + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = p_sscanf(buffer, "%i", &result);

4 6