wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

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

21 Dec '21

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 21 Dec '21

21 Dec '21

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: Remove the VM options.
by Alexandre Julliard 21 Dec '21

21 Dec '21

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

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

21 Dec '21

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: Accept underscores in the locale names.
by Alexandre Julliard 21 Dec '21

21 Dec '21

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

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

20 Dec '21

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

Alex Henrie : quartz: Fix memory leaks on error paths in FilterMapper3_RegisterFilter (cppcheck).
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 8e081d32bd35f5a2acdef10bd541ee039038e5ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e081d32bd35f5a2acdef10b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:56:08 2021 -0700 quartz: Fix memory leaks on error paths in FilterMapper3_RegisterFilter (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 230273891d4..a95f0ca7832 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -894,12 +894,16 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, if (FAILED(hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser))) + { + free(display_name); return hr; + } if (FAILED(hr = IParseDisplayName_ParseDisplayName(parser, NULL, display_name, &eaten, &moniker))) { ERR("Failed to parse display name, hr %#x.\n", hr); IParseDisplayName_Release(parser); + free(display_name); return hr; } @@ -909,6 +913,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, { ERR("Failed to get property bag, hr %#x.\n", hr); IMoniker_Release(moniker); + free(display_name); return hr; }

1 0

Rémi Bernon : dinput: Ignore objects without a collection in init_pid_caps.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 531297a8b4c3125c92b2bd0d10058bc753939fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=531297a8b4c3125c92b2bd0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:18 2021 +0100 dinput: Ignore objects without a collection in init_pid_caps. This makes sure we don't try to set effect_state report id from objects without a collection, causing some false warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 682af063ff1..64ddce3c7b0 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1732,6 +1732,9 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap FIXME( "multiple " #rep " report ids!\n" ); \ } while (0) + if (!instance->wCollectionNumber) + return DIENUM_CONTINUE; + if (instance->wCollectionNumber == effect_state->collection) SET_REPORT_ID( effect_state );

1 0

Rémi Bernon : dinput: Convert wide action format back to ansi in ConfigureDevices.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: e5131028b94818e4b5cfc3252ab51cdac62477ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5131028b94818e4b5cfc325… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:17 2021 +0100 dinput: Convert wide action format back to ansi in 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 insertion(+) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 10b96a1e059..b7ec426b2e0 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -840,6 +840,7 @@ static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDIC params_w.lprgFormats = &format_w; if (SUCCEEDED(hr)) hr = IDirectInput8_ConfigureDevices( iface_w, callback, &params_w, flags, ref ); + if (SUCCEEDED(hr)) diactionformat_wtoa( &format_w, format_a ); if (!format_w.hInstString) {

1 0

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

20 Dec '21

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

← Newer
1
...
7
8
9
10
11
12
13
...
57
Older →

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 December 2021