December 2021 - Wine-Commits

Alex Henrie : wldap32: Fix memory leak on error path in create_page_control (cppcheck).
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: wine Branch: master Commit: 3f2458996c55b1e0ea8278015aa80450d459eada URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2458996c55b1e0ea827801… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 20 22:06:08 2021 -0700 wldap32: Fix memory leak on error path in create_page_control (cppcheck). 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> --- 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; }

1 0

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

Dec. 21, 2021

Module: wine Branch: master Commit: 06923f61e25bf5fb1037303e94014e515f3fc4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=06923f61e25bf5fb1037303e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 20 22:01:21 2021 -0700 nsiproxy: Fix use after free in icmp_send_echo (scan-build). 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> --- 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; }

1 0

Francois Gouget : testbot/SetWinLocale: Accept underscores in the locale names.
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: tools Branch: master Commit: 73bd7f01fbefb1d29b32560b6bc52e55e4c38d6f URL: https://source.winehq.org/git/tools.git/?a=commit;h=73bd7f01fbefb1d29b32560… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 21 16:38:29 2021 +0100 testbot/SetWinLocale: Accept underscores in the locale names. Also avoid undefined value errors if the locale value is missing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 7ddbded..4ecc0cb 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -279,14 +279,16 @@ sub CheckValue($$) sub CheckLocale($$) { my ($Option, $Value) = @_; + $Value = CheckValue($Option, $Value); - if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) - { - Error("'$Value' is not a valid $Option locale\n"); - $Usage = 2; - return undef; - } - return $Value; + return undef if (!defined $Value); + + $Value =~ s/_/-/g; + return $Value if ($Value =~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/); + + Error("'$Value' is not a valid $Option locale\n"); + $Usage = 2; + return undef; } my ($OptHostName, $OptReboot);

1 0

Francois Gouget : testbot/SetWinLocale: Show the intl.cpl XML file in --debug mode.
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: tools Branch: master Commit: 5922e16ff817a380bae24b8f981c6d52f1f5a1ad URL: https://source.winehq.org/git/tools.git/?a=commit;h=5922e16ff817a380bae24b8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 21 16:38:47 2021 +0100 testbot/SetWinLocale: Show the intl.cpl XML file in --debug mode. In addition to the --dry-run mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 4ecc0cb..d4ba517 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -786,11 +786,10 @@ $OptHostName = $VM->Hostname if ($VM); # For error messages my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); -if ($DryRun) -{ - print STDERR join("\n", "locales.xml:", @Config, ""); -} -elsif (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); + +if (!$DryRun and + !$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) { FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); }

1 0

Francois Gouget : testbot/SetWinLocale: Remove the VM options.
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: tools Branch: master Commit: 206c7478dcb4cd1eff43201413637293fb51fc26 URL: https://source.winehq.org/git/tools.git/?a=commit;h=206c7478dcb4cd1eff43201… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 21 16:39:05 2021 +0100 testbot/SetWinLocale: Remove the VM options. The TestBot creates the the missing live snapshots itself so these options were unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 327 +++-------------------------------------------- 1 file changed, 21 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=206c7478dcb4cd1eff4…

1 0

Rémi Bernon : dinput: Ignore NULL callback in IDirectInput_ConfigureDevices.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: a37346c6bb45b345de4fdc756f64806b541e35d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37346c6bb45b345de4fdc75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:16 2021 +0100 dinput: Ignore NULL callback in IDirectInput_ConfigureDevices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52198 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index a773dacbec5..10b96a1e059 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -829,7 +829,6 @@ static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDIC HRESULT hr; DWORD i; - if (!callback) return DIERR_INVALIDPARAM; if (FAILED(hr = diconfiguredevicesparams_atow( params_a, &params_w ))) return hr; format_w.dwNumActions = format_a->dwNumActions;

1 0

Alex Henrie : mountmgr: Change scope of variable pvd in VOLUME_GetSuperblockLabel (cppcheck).
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: 656d7f58a11c53d2c1f5c0b6073324ecaded4088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=656d7f58a11c53d2c1f5c0b6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:54:21 2021 -0700 mountmgr: Change scope of variable pvd in VOLUME_GetSuperblockLabel (cppcheck). The data in pvd was being accessed through the label_ptr variable after pvd went out of scope. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index d4f77012bbe..b8a0040195d 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -398,6 +398,7 @@ static void VOLUME_GetSuperblockLabel( struct volume *volume, HANDLE handle, con { const BYTE *label_ptr = NULL; DWORD label_len; + BYTE pvd[BLOCK_SIZE]; switch (volume->fs_type) { @@ -435,32 +436,28 @@ static void VOLUME_GetSuperblockLabel( struct volume *volume, HANDLE handle, con break; } case FS_UDF: + if(!UDF_Find_PVD(handle, pvd)) { - BYTE pvd[BLOCK_SIZE]; - - if(!UDF_Find_PVD(handle, pvd)) - { - label_len = 0; - break; - } + label_len = 0; + break; + } - /* [E] 3/10.1.4 and [U] 2.1.1 */ - if(pvd[24]==8) - { - label_ptr = pvd + 24 + 1; - label_len = pvd[24+32-1]; - break; - } - else - { - unsigned int i; + /* [E] 3/10.1.4 and [U] 2.1.1 */ + if(pvd[24]==8) + { + label_ptr = pvd + 24 + 1; + label_len = pvd[24+32-1]; + break; + } + else + { + unsigned int i; - label_len = 1 + pvd[24+32-1]; - for (i = 0; i < label_len; i += 2) - volume->label[i/2] = (pvd[24+1+i] << 8) | pvd[24+1+i+1]; - volume->label[label_len] = 0; - return; - } + label_len = 1 + pvd[24+32-1]; + for (i = 0; i < label_len; i += 2) + volume->label[i/2] = (pvd[24+1+i] << 8) | pvd[24+1+i+1]; + volume->label[label_len] = 0; + return; } } if (label_len) RtlMultiByteToUnicodeN( volume->label, sizeof(volume->label) - sizeof(WCHAR),

1 0

Rémi Bernon : dinput: Keep action names when converting back to ansi.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: dd1f3434d6ef5f1e7357fcfe29c209d2def907a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1f3434d6ef5f1e7357fcfe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:15 2021 +0100 dinput: Keep action names when converting back to ansi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52198 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 3c7b6ced169..a773dacbec5 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -150,7 +150,6 @@ static void diactionformat_wtoa( const DIACTIONFORMATW *in, DIACTIONFORMATA *out out->rgoAction[i].guidInstance = in->rgoAction[i].guidInstance; out->rgoAction[i].dwObjID = in->rgoAction[i].dwObjID; out->rgoAction[i].dwHow = in->rgoAction[i].dwHow; - out->rgoAction[i].lptszActionName = 0; } out->guidActionMap = in->guidActionMap;

1 0

Eric Pouech : cmd: Don't crash on 'if exist' without parameter.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: 535da77552deb74198f0fe8fedae3bbab5115ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535da77552deb74198f0fe8f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 20 10:29:01 2021 +0100 cmd: Don't crash on 'if exist' without parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51598 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d0a954d90fa..d14e69e072a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2811,8 +2811,9 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); int len = lstrlenW(param); + if (!len) goto syntax_err; /* FindFirstFile does not like a directory path ending in '\', append a '.' */ - if (len && param[len-1] == '\\') lstrcatW(param, L"."); + if (param[len-1] == '\\') lstrcatW(param, L"."); hff = FindFirstFileW(param, &fd); *test = (hff != INVALID_HANDLE_VALUE );

1 0

Alex Henrie : nsiproxy: Fix memory leaks on error paths in get_ipv6_addr_scope_table (cppcheck).
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: cf7dd52091400c39c3f5718de8258b3ca97f36be URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf7dd52091400c39c3f5718d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:55:31 2021 -0700 nsiproxy: Fix memory leaks on error paths in get_ipv6_addr_scope_table (cppcheck). 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> --- dlls/nsiproxy.sys/tcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 6dd0aaa9b45..0cd81ae86e5 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -235,7 +235,7 @@ static inline MIB_TCP_STATE tcp_state_to_mib_state( int state ) struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { - struct ipv6_addr_scope *table = NULL; + struct ipv6_addr_scope *table = NULL, *new_table; unsigned int table_size = 0, num = 0; #ifdef __linux__ @@ -260,11 +260,12 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = realloc( table, table_size * sizeof(table[0]) ))) + if (!(new_table = realloc( table, table_size * sizeof(table[0]) ))) { fclose( fp ); goto failed; } + table = new_table; } entry = table + num - 1; @@ -292,11 +293,12 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = realloc( table, table_size * sizeof(table[0]) ))) + if (!(new_table = realloc( table, table_size * sizeof(table[0]) ))) { freeifaddrs( addrs ); goto failed; } + table = new_table; } sin6 = (struct sockaddr_in6 *)cur->ifa_addr;

1 0