- Wine-Devel - list.winehq.org

[PATCH] wineconsole: Remove "option" from the man page.
by Floris Renaud Dec. 21, 2021

Dec. 21, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- programs/wineconsole/wineconsole.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.man.in b/programs/wineconsole/wineconsole.man.in index 251579c1422..dac4e62f321 100644 --- a/programs/wineconsole/wineconsole.man.in +++ b/programs/wineconsole/wineconsole.man.in @@ -3,11 +3,11 @@ wineconsole \- The Wine console .SH SYNOPSIS .B wineconsole -.RI [ option "] " command +.RI [ command "] " .SH DESCRIPTION .B wineconsole is the Wine console manager, used to run console commands and applications. It allows running the -console either in the current terminal (\fIcurses\fR) or in a newly made window (\fIuser\fR). +console in a newly made window. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org -- 2.34.1

1 0

[PATCH v2] wldap32: Fix memory leak on error path in create_page_control (cppcheck)
by Alex Henrie Dec. 21, 2021

Dec. 21, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Fix typo in commit message --- 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

2 1

[PATCH] wpcap: Remove unused variable ptr from build_win32_description (cppcheck)
by Alex Henrie Dec. 21, 2021

Dec. 21, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wpcap/wpcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 59e8f43f77c..b140deeb3d2 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -240,10 +240,10 @@ static char *build_win32_name( const char *source, const char *adapter_name ) static char *build_win32_description( const struct pcap_interface *unix_dev ) { int len = strlen(unix_dev->name) + 1; - char *ret, *ptr; + char *ret; if (unix_dev->description && unix_dev->description[0]) len += strlen(unix_dev->description) + 1; - if ((ret = ptr = malloc( len ))) + if ((ret = malloc( len ))) { if (unix_dev->description) { -- 2.34.1

2 1

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

Dec. 21, 2021

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 Dec. 21, 2021

Dec. 21, 2021

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 Dec. 21, 2021

Dec. 21, 2021

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 Dec. 21, 2021

Dec. 21, 2021

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 Dec. 21, 2021

Dec. 21, 2021

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 Dec. 21, 2021

Dec. 21, 2021

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 Dec. 21, 2021

Dec. 21, 2021

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