October 2017 - Wine-commits

Józef Kucia : user32: Fix memory leak in WinHelpA().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: ee4165f4373b96328b90f35d279c66af49835967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4165f4373b96328b90f35d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 30 12:21:54 2017 +0200 user32: Fix memory leak in WinHelpA(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae9d5ce5f70ca196ee6b71e9d16cd4ded914d4f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/winhelp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index a2c331b..c40b0fc 100644 --- a/dlls/user32/winhelp.c +++ b/dlls/user32/winhelp.c @@ -80,6 +80,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD HWND hDest; int size, dsize, nlen; WINHELP* lpwh; + LRESULT ret; hDest = FindWindowA("MS_WINHELP", NULL); if (!hDest) @@ -156,7 +157,9 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->size, lpwh->command, lpwh->data, lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); - return SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + ret = SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + HeapFree(GetProcessHeap(), 0, lpwh); + return ret; }

1 0

Dmitry Timoshkov : user.exe16: Fix memory leak in case when HeapReAlloc fails.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: faa13dd161fd3d0aaf14c34c86d1eda2c23a85cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa13dd161fd3d0aaf14c34c8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 15:56:24 2017 +0800 user.exe16: Fix memory leak in case when HeapReAlloc fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8c3ed829279cb7951688392801e3210abd19d27f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/user.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index aba797d..4a00d58 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -3245,8 +3245,11 @@ DWORD WINAPI FormatMessage16( /* CMF - This makes a BIG assumption about va_list */ while ((ret = vsnprintf(b, sz, fmtstr, (va_list) argliststart)) < 0 || ret >= sz) { + LPSTR new_b; sz = (ret == -1 ? sz + 100 : ret + 1); - b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + new_b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); + if (!new_b) break; + b = new_b; } for (x=b; *x; x++) ADD_TO_T(*x); HeapFree(GetProcessHeap(), 0, b);

1 0

Dmitry Timoshkov : dsound: Fix a memory leak.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 8f5c2ad60c649bb0d130454a5c998b6202a1e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5c2ad60c649bb0d130454a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:23:52 2017 +0800 dsound: Fix a memory leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c39121fc97a0f8441ef0a9fb8e4103631574c504) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/dsound_private.h | 15 ++++++++++++++- dlls/dsound/propset.c | 12 +++++------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 796fe1e..8dd86e4 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -89,7 +89,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 63d1226..53914cd 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -31,6 +31,7 @@ #include "uuids.h" #include "wine/list.h" +#include "wine/unicode.h" #define DS_MAX_CHANNELS 6 @@ -254,7 +255,7 @@ extern struct list DSOUND_renderers DECLSPEC_HIDDEN; extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; -extern WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; +extern const WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; void setup_dsound_options(void) DECLSPEC_HIDDEN; @@ -264,3 +265,15 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels) DECLSPEC_HIDDEN; HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, LPDSENUMCALLBACKW cb, void *user) DECLSPEC_HIDDEN; + +static inline WCHAR *strdupW( const WCHAR *str ) +{ + size_t size; + WCHAR *ret; + + if (!str) return NULL; + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) memcpy( ret, str, size ); + return ret; +} diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index b89c45a..9ef4ac9 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -200,7 +200,6 @@ static HRESULT DSPROPERTY_DescriptionW( IMMDevice *mmdevice; IPropertyStore *ps; PROPVARIANT pv; - DWORD desclen; HRESULT hr; TRACE("pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", @@ -248,12 +247,9 @@ static HRESULT DSPROPERTY_DescriptionW( return hr; } - desclen = lstrlenW(pv.u.pwszVal) + 1; - /* FIXME: Still a memory leak.. */ - ppd->Description = HeapAlloc(GetProcessHeap(), 0, desclen * sizeof(WCHAR)); - memcpy(ppd->Description, pv.u.pwszVal, desclen * sizeof(WCHAR)); - ppd->Module = wine_vxd_drv; - ppd->Interface = wInterface; + ppd->Description = strdupW(pv.u.pwszVal); + ppd->Module = strdupW(wine_vxd_drv); + ppd->Interface = strdupW(wInterface); ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; PropVariantClear(&pv); @@ -463,6 +459,7 @@ static HRESULT DSPROPERTY_DescriptionA( return hr; if (!DSPROPERTY_descWtoA(&data, ppd)) hr = E_OUTOFMEMORY; + HeapFree(GetProcessHeap(), 0, data.Description); HeapFree(GetProcessHeap(), 0, data.Module); HeapFree(GetProcessHeap(), 0, data.Interface); return hr; @@ -488,6 +485,7 @@ static HRESULT DSPROPERTY_Description1( if (FAILED(hr)) return hr; DSPROPERTY_descWto1(&data, ppd); + HeapFree(GetProcessHeap(), 0, data.Description); HeapFree(GetProcessHeap(), 0, data.Module); HeapFree(GetProcessHeap(), 0, data.Interface); return hr;

1 0

Daniel Lehman : mshtml: Decrement refcount in nsWeakReference::Release ( Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: a018ea5501975d54476a61114a482de3e38db617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a018ea5501975d54476a61114… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Mar 20 22:56:50 2017 -0700 mshtml: Decrement refcount in nsWeakReference::Release (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f21ec7f170950b610c5fbd36c8eda74a530cfe22) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e343dde..aee00e6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1204,7 +1204,7 @@ static nsrefcnt NSAPI nsWeakReference_AddRef(nsIWeakReference *iface) static nsrefcnt NSAPI nsWeakReference_Release(nsIWeakReference *iface) { nsWeakReference *This = impl_from_nsIWeakReference(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref);

1 0

Hans Leidekker : wbemprox: Also free data for tables that don' t have a fill function (Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 64d406c8c47a02b41d0729396708d49e7dc2c064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d406c8c47a02b41d0729396… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:20 2017 +0100 wbemprox: Also free data for tables that don't have a fill function (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 66e3c97ca79f2dba590d281cfb4e04face345617) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 273b8cb..ad56e0c 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -334,6 +334,7 @@ void free_table( struct table *table ) TRACE("destroying %p\n", table); heap_free( (WCHAR *)table->name ); free_columns( (struct column *)table->columns, table->num_cols ); + heap_free( table->data ); list_remove( &table->entry ); heap_free( table ); }

1 0

Hans Leidekker : advpack: Don't trace the contents of an output buffer ( Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: ad68a529866b3d0003fef30fed91ff48438d4455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad68a529866b3d0003fef30fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:21 2017 +0100 advpack: Don't trace the contents of an output buffer (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c0b37037f5f00d2f68036ddeaf58aac3b7e5497f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/advpack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 2469f7b..d2ce60e 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -763,9 +763,9 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, HRESULT res; DWORD len = 0; - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), - debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!pszInfFilename || !pszTranslateSection || !pszTranslateKey || !pdwRequiredSize) @@ -843,9 +843,9 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, LPWSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), - debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey) return E_INVALIDARG;

1 0

Hans Leidekker : msi: Avoid zero size allocations (Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 3736b7dbce3ba0e3ff1dec03d8e271e2124a1cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3736b7dbce3ba0e3ff1dec03d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 28 10:45:56 2017 +0200 msi: Avoid zero size allocations (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d12728a872b03a537ee6d92789fb6cbd2d86ba1d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 2b36091..b364d97 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -422,13 +422,11 @@ static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg goto err; } - t->row_count = rawsize / row_size; - t->data = msi_alloc_zero( t->row_count * sizeof (USHORT*) ); - if( !t->data ) - goto err; - t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL)); - if ( !t->data_persistent ) - goto err; + if ((t->row_count = rawsize / row_size)) + { + if (!(t->data = msi_alloc_zero( t->row_count * sizeof(USHORT *) ))) goto err; + if (!(t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL) ))) goto err; + } /* transpose all the data */ TRACE("Transposing data from %d rows\n", t->row_count );

1 0

Hugh McMaster : regedit: Prevent out-of-bounds reads when unescaping a string (Valgrind).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: b12440fe31d56411c444d89a1e9db24ec3571411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12440fe31d56411c444d89a1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 26 13:15:57 2017 +0000 regedit: Prevent out-of-bounds reads when unescaping a string (Valgrind). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 976c2aa649a526188afd9c0647869ccc82068341) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/regproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 5e4c2d2..4d61ab1 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -275,6 +275,7 @@ static int REGPROC_unescape_string(WCHAR* str) str[val_idx] = str[str_idx]; break; default: + if (!str[str_idx]) return FALSE; output_message(STRING_ESCAPE_SEQUENCE, str[str_idx]); str[val_idx] = str[str_idx]; break;

1 0

André Hentschel : oleview: Fix bytecount for memmoves (Coverity).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 79e6537c10b46f8342b77a1c6e73678d2401143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e6537c10b46f8342b77a1c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:08 2017 +0100 oleview: Fix bytecount for memmoves (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dd3c58c497a58189f5ead6d223f3f8d610d4b3c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/oleview/details.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index b194f6f..fda9b7c 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -139,7 +139,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad } else if(addings && !memcmp(wszName, wszProxyStubClsid32, sizeof(WCHAR[17]))) { - lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + lenData = sizeof(wszData); RegQueryValueW(hCurKey, NULL, wszData, (LONG *)&lenData); RegCloseKey(hCurKey); @@ -155,7 +155,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[6], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[6], wszData, lenData); memcpy(wszData, wszCLSID, sizeof(WCHAR[6])); wszData[5] = '\\'; @@ -183,7 +183,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[8], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[8], wszData, lenData); memcpy(wszData, wszTypeLib, sizeof(WCHAR[8])); wszData[7] = '\\'; RegOpenKeyW(HKEY_CLASSES_ROOT, wszData, &hCurKey); @@ -229,12 +229,11 @@ static void CreateReg(WCHAR *buffer) *path = '\\'; path += 1; - lenTree = sizeof(WCHAR[MAX_LOAD_STRING]); + lenTree = sizeof(wszTree); if(RegQueryValueW(hKey, NULL, wszTree, (LONG *)&lenTree) == ERROR_SUCCESS) { - memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, - lenTree * sizeof(WCHAR)); + memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, lenTree); memcpy(wszTree, &buffer[lastLenBuffer], (lenBuffer - lastLenBuffer) * sizeof(WCHAR));

1 0

Marcus Meissner : msvcrt: Free the temporary filename (Coverity).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 47876de741048659911fc630d5acdedfdf99b969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47876de741048659911fc630d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 20 09:08:39 2017 +0200 msvcrt: Free the temporary filename (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d3d43ffdedcf765ecbd0ec160f384156069849bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b1c66e5..51d2e23 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4989,6 +4989,7 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) if(fd != -1 && !file) MSVCRT__close(fd); + MSVCRT_free(filename); UNLOCK_FILES(); return file; }

1 0