October 2012 - Wine-Commits

André Hentschel : msxml3: Avoid memory leak (coverity) .
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 764011a94f884af336bc8a27dc0b94b461efc288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764011a94f884af336bc8a27d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:41 2012 +0100 msxml3: Avoid memory leak (coverity). --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 5700311..9a9d93e 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -689,6 +689,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) { SafeArrayUnaccessData(sa); + heap_free(bsc); return hr; } size++;

1 0

André Hentschel : ole32: Don' t leak memory allocated by FileMonikerImpl_DecomposePath (coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: c223354912255b7d422e4461bd15712e886fa6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c223354912255b7d422e4461b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:43 2012 +0100 ole32: Don't leak memory allocated by FileMonikerImpl_DecomposePath (coverity). --- dlls/ole32/filemoniker.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 20c0870..b3a5cc2 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -711,24 +711,25 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, /* the length of the composed path string is raised by the sum of the two paths lengths */ newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); - if (newStr==NULL) - return E_OUTOFMEMORY; - - /* new path is the concatenation of the rest of str1 and str2 */ - for(*newStr=0,j=0;j<=lastIdx1;j++) - strcatW(newStr,strDec1[j]); + if (newStr) + { + /* new path is the concatenation of the rest of str1 and str2 */ + for(*newStr=0,j=0;j<=lastIdx1;j++) + strcatW(newStr,strDec1[j]); - if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) - strcatW(newStr,bkSlash); + if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) + strcatW(newStr,bkSlash); - for(j=i;j<=lastIdx2;j++) - strcatW(newStr,strDec2[j]); + for(j=i;j<=lastIdx2;j++) + strcatW(newStr,strDec2[j]); - /* create a new moniker with the new string */ - res=CreateFileMoniker(newStr,ppmkComposite); + /* create a new moniker with the new string */ + res=CreateFileMoniker(newStr,ppmkComposite); - /* free all strings space memory used by this function */ - HeapFree(GetProcessHeap(),0,newStr); + /* free all strings space memory used by this function */ + HeapFree(GetProcessHeap(),0,newStr); + } + else res = E_OUTOFMEMORY; for(i=0; strDec1[i]!=NULL;i++) CoTaskMemFree(strDec1[i]);

1 0

André Hentschel : oleaut32: Don't leak SafeArray ( coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: b45e4496af3f23125edacef90a90fb1b135bfc7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45e4496af3f23125edacef90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:51 2012 +0100 oleaut32: Don't leak SafeArray (coverity). --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 602181c..7700121 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6499,6 +6499,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (hres != S_OK) { ERR("SafeArrayAccessData failed with %x\n", hres); + SafeArrayDestroy(a); break; } for (j = 0; j < bound.cElements; j++) @@ -6507,6 +6508,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (hres != S_OK) { ERR("SafeArrayUnaccessData failed with %x\n", hres); + SafeArrayDestroy(a); break; } V_ARRAY(&rgvarg[i]) = a;

1 0

André Hentschel : fusion: Reorder some code to avoid memory leak (coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: c19dd4764307c5101273a658299915978ddc7e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19dd4764307c5101273a6582… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:35 2012 +0100 fusion: Reorder some code to avoid memory leak (coverity). --- dlls/fusion/fusion.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 6ace81f..e79fa3a 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -76,9 +76,9 @@ static HRESULT get_corversion(LPWSTR version, DWORD size) pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); if (!pGetCORVersion) - return E_FAIL; - - hr = pGetCORVersion(version, size, &len); + hr = E_FAIL; + else + hr = pGetCORVersion(version, size, &len); FreeLibrary(hmscoree); return hr;

1 0

André Hentschel : dplayx/tests: Add missing GetPlayerName test.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 436e9f9c06416e92724e02170693d50cebc3be2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=436e9f9c06416e92724e02170… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:15:15 2012 +0100 dplayx/tests: Add missing GetPlayerName test. --- dlls/dplayx/tests/dplayx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e020a47..c6ab185 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -2525,6 +2525,13 @@ static void test_PlayerName(void) hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, DPSET_GUARANTEED ); checkHR( DP_OK, hr ); + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 45, dwDataSize ); + checkStr( U1(playerName).lpszShortNameA, U1(*(LPDPNAME)lpData).lpszShortNameA ); + checkStr( U2(playerName).lpszLongNameA, U2(*(LPDPNAME)lpData).lpszLongNameA ); + check( 0, ((LPDPNAME)lpData)->dwFlags ); /* - Local (no propagation) */ U1(playerName).lpszShortNameA = (LPSTR) "no_propagation";

1 0

André Hentschel : urlmon: Avoid memory leaks (coverity ).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 99a0c55a8fb502770c31ce1e92c36cece1f288c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a0c55a8fb502770c31ce1e9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:17:03 2012 +0100 urlmon: Avoid memory leaks (coverity). --- dlls/urlmon/bindprot.c | 3 +++ dlls/urlmon/uri.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 60912a4..8deccda 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -1149,7 +1149,10 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface task = heap_alloc(sizeof(switch_task_t)); if(!task) + { + heap_free(data); return E_OUTOFMEMORY; + } task->data = data; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 20e0582..18e2ebb 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5185,8 +5185,10 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) if(!data) return E_OUTOFMEMORY; hr = IStream_Read(pStm, &data->unk1, size-sizeof(DWORD)-2, NULL); - if(FAILED(hr)) + if(FAILED(hr)) { + heap_free(data); return hr; + } if(size < sizeof(struct persist_uri)) { heap_free(data); @@ -6356,8 +6358,10 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve Uri *uri; if((uri = get_uri_obj(pIUri))) { - if(!uri->create_flags) + if(!uri->create_flags) { + heap_free(ret); return E_UNEXPECTED; + } IUri_AddRef(pIUri); ret->uri = uri;

1 0

André Hentschel : shell32: Reorder code to avoid memory leaks (coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: b4b396a957290a0f7fffc36763e4f15c2d798e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b396a957290a0f7fffc3676… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:17:01 2012 +0100 shell32: Reorder code to avoid memory leaks (coverity). --- dlls/shell32/brsfolder.c | 6 +++--- dlls/shell32/pidl.c | 3 ++- dlls/shell32/shelldispatch.c | 2 +- dlls/shell32/shellpath.c | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3200051..0e7b9d3 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -369,11 +369,11 @@ static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf, tvi.cChildren= pEnumIL ? 1 : 0; tvi.mask |= TVIF_CHILDREN; - lptvid = SHAlloc( sizeof(TV_ITEMDATA) ); - if (!lptvid) + if (!GetName(lpsf, pidl, SHGDN_NORMAL, szBuff)) return NULL; - if (!GetName(lpsf, pidl, SHGDN_NORMAL, szBuff)) + lptvid = SHAlloc( sizeof(TV_ITEMDATA) ); + if (!lptvid) return NULL; tvi.pszText = szBuff; diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 58b8104..a712504 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2503,10 +2503,11 @@ LPITEMIDLIST* _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) UINT i; LPITEMIDLIST *apidldest; - apidldest = SHAlloc(cidl * sizeof(LPITEMIDLIST)); if (!apidlsrc) return NULL; + apidldest = SHAlloc(cidl * sizeof(LPITEMIDLIST)); + for (i = 0; i < cidl; i++) apidldest[i] = ILClone(apidlsrc[i]); diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 825c405..65237ef 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1061,7 +1061,7 @@ static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch2 *iface, BST if (!service) { ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); - CloseServiceHandle(service); + CloseServiceHandle(scm); return S_OK; } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e607149..6fdd762 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3790,7 +3790,10 @@ static BOOL is_knownfolder( struct foldermanager *fm, const KNOWNFOLDERID *id ) hr = get_known_folder_registry_path(id, NULL, &registryPath); if(SUCCEEDED(hr)) + { hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, 0, &hKey)); + HeapFree(GetProcessHeap(), 0, registryPath); + } if(SUCCEEDED(hr)) {

1 0

Francois Gouget : testbot/scripts: Fix a stray reference to the winetest user and group.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: tools Branch: master Commit: 832b73319b718d85a19130a16efda41b43676177 URL: http://source.winehq.org/git/tools.git/?a=commit;h=832b73319b718d85a19130a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 15:53:16 2012 +0100 testbot/scripts: Fix a stray reference to the winetest user and group. Remove the reference to the group entirely. --- testbot/scripts/initd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 0424174..bffc26d 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -159,7 +159,7 @@ then echo -n "Starting WineTestBot " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - /sbin/startproc -u winetest -g winetest $DAEMON + /sbin/startproc -u $USER $DAEMON # Remember status and be verbose rc_status -v

1 0

Francois Gouget : testbot/scripts: Remove the hardcoded path and username.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: tools Branch: master Commit: 12ea02c6d59b39fb40f3e67ea4d0116d3c4c95c2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=12ea02c6d59b39fb40f3e67e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 15:53:38 2012 +0100 testbot/scripts: Remove the hardcoded path and username. Instead, fail if they are not set and tell the user to either put them in the script or in the standard /etc/default directory. --- testbot/scripts/initd | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index bffc26d..262fa54 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -33,8 +33,18 @@ # Description: Start winetestbot to start job processing ### END INIT INFO -USER="winehq" -WTB_ROOT="/home/winehq/tools/testbot" +USER= +WTB_ROOT= +if [ $ -z "$USER" -o -z "$WTB_ROOT" $ -a -f "/etc/default/winetestbot" ] +then + . /etc/default/winetestbot +fi +if [ -z "$USER" -o -z "$WTB_ROOT" ] +then + echo "Set the username and WineTestBot root in the init.d script or in /etc/default/winetestbot" >&2 + exit 1 +fi + DAEMON="$WTB_ROOT/bin/Engine.pl" PING="$WTB_ROOT/bin/PingEngine.pl" PIDFILE="/var/run/winetestbot.pid"

1 0

Francois Gouget : testbot/scripts: Print error messages on stderr.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: tools Branch: master Commit: cad268f24209cb5e85ae4d8d1594113511ae2218 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cad268f24209cb5e85ae4d8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 15:53:06 2012 +0100 testbot/scripts: Print error messages on stderr. --- testbot/scripts/initd | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 9d3e8b1..0424174 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -112,7 +112,7 @@ then ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" >&2 exit 1 ;; esac @@ -179,7 +179,7 @@ then ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then @@ -210,7 +210,7 @@ then ;; status) status_of_proc $DAEMON -echo -n "Checking for service WineTestBot " + echo -n "Checking for service WineTestBot " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. @@ -230,7 +230,7 @@ echo -n "Checking for service WineTestBot " rc_status -v ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" >&2 exit 1 ;; esac @@ -238,6 +238,6 @@ echo -n "Checking for service WineTestBot " else - echo "WineTestBot does not know how to start on this system" + echo "WineTestBot does not know how to start on this system" >&2 exit 1 fi

1 0