October 2012 - Wine-commits

André Hentschel : rpcrt4: Reorder code to make sure RpcBindingFromStringBinding[AW] cleans up ( coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 81c0e1eaa1ba41e2b27e1f968a2f2588a6ec79f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c0e1eaa1ba41e2b27e1f968… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:56 2012 +0100 rpcrt4: Reorder code to make sure RpcBindingFromStringBinding[AW] cleans up (coverity). --- dlls/rpcrt4/rpc_binding.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 11956e3..8152f87 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -851,10 +851,16 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingA(&bind, FALSE, (char*)Protseq); - if (ret != RPC_S_OK) return ret; - ret = RPCRT4_SetBindingObject(bind, &Uuid); - if (ret == RPC_S_OK) - ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); + if (ret == RPC_S_OK) { + ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret == RPC_S_OK) + ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); + + if (ret == RPC_S_OK) + *Binding = (RPC_BINDING_HANDLE)bind; + else + RPCRT4_ReleaseBinding(bind); + } RpcStringFreeA(&Options); RpcStringFreeA(&Endpoint); @@ -862,11 +868,6 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND RpcStringFreeA(&Protseq); RpcStringFreeA(&ObjectUuid); - if (ret == RPC_S_OK) - *Binding = (RPC_BINDING_HANDLE)bind; - else - RPCRT4_ReleaseBinding(bind); - return ret; } @@ -890,10 +891,16 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingW(&bind, FALSE, Protseq); - if (ret != RPC_S_OK) return ret; - ret = RPCRT4_SetBindingObject(bind, &Uuid); - if (ret == RPC_S_OK) - ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options); + if (ret == RPC_S_OK) { + ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret == RPC_S_OK) + ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options); + + if (ret == RPC_S_OK) + *Binding = (RPC_BINDING_HANDLE)bind; + else + RPCRT4_ReleaseBinding(bind); + } RpcStringFreeW(&Options); RpcStringFreeW(&Endpoint); @@ -901,11 +908,6 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND RpcStringFreeW(&Protseq); RpcStringFreeW(&ObjectUuid); - if (ret == RPC_S_OK) - *Binding = (RPC_BINDING_HANDLE)bind; - else - RPCRT4_ReleaseBinding(bind); - return ret; }

1 0

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

29 Oct '12

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

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

29 Oct '12

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 : msxml3: Avoid memory leak (coverity) .
by Alexandre Julliard 29 Oct '12

29 Oct '12

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 29 Oct '12

29 Oct '12

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 memory allocated by heap_alloc_zero (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a46bfd644d8b80c54f315869420b9eaf85e6a061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46bfd644d8b80c54f3158694… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:54 2012 +0100 oleaut32: Don't leak memory allocated by heap_alloc_zero (coverity). --- dlls/oleaut32/typelib.c | 9 +++++---- dlls/oleaut32/typelib2.c | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7700121..3d94164 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4070,10 +4070,10 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) SLTG_TypeInfoTail *pTITail; SLTG_MemberHeader *pMemHeader; - if(strcmp(pBlkEntry[order].index_string + (char*)pMagic, - pOtherTypeInfoBlks[i].index_name)) { - FIXME_(typelib)("Index strings don't match\n"); - return NULL; + if(strcmp(pBlkEntry[order].index_string + (char*)pMagic, pOtherTypeInfoBlks[i].index_name)) { + FIXME_(typelib)("Index strings don't match\n"); + heap_free(pOtherTypeInfoBlks); + return NULL; } pTIHeader = pBlk; @@ -4189,6 +4189,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) if(i != pTypeLibImpl->TypeInfoCount) { FIXME("Somehow processed %d TypeInfos\n", i); + heap_free(pOtherTypeInfoBlks); return NULL; } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8ea95fe..689d9af 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -5272,7 +5272,8 @@ static ICreateTypeLib2 *ICreateTypeLib2_Constructor(SYSKIND syskind, LPCOLESTR f if (failed) { ICreateTypeLib2_fnRelease(&create_tlib2->ICreateTypeLib2_iface); - return NULL; + heap_free(create_tlib2); + return NULL; } return &create_tlib2->ICreateTypeLib2_iface;

1 0

André Hentschel : setupapi: Avoid memory leaks ( coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 4d796458d0ed517d45adc57a1aedaf1c3bdde232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d796458d0ed517d45adc57a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:58 2012 +0100 setupapi: Avoid memory leaks (coverity). --- dlls/setupapi/install.c | 1 + dlls/setupapi/queue.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 1c8236a..e216e8c 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1640,6 +1640,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, ( 2 + dir_len + name_len) * sizeof( WCHAR )); if( !fullname ) { + FindClose( hdl ); HeapFree( GetProcessHeap(), 0, filter ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cd733a0..1855e99 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1156,7 +1156,11 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) return FALSE; + if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) + { + HeapFree( GetProcessHeap(), 0, inf_source ); + return FALSE; + } source = inf_source; } else if (!source)

1 0

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

29 Oct '12

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 29 Oct '12

29 Oct '12

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/lib: Simplify a couple of job sorting functions.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: tools Branch: master Commit: 89bb44ec1046696fe4ed741e7eb30e6da5ada5b5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=89bb44ec1046696fe4ed741e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 15:39:13 2012 +0100 testbot/lib: Simplify a couple of job sorting functions. --- testbot/lib/WineTestBot/Jobs.pm | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b56e203..de66023 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -357,24 +357,12 @@ sub CreateJobs sub CompareJobPriority { - my $Compare = $a->Priority <=> $b->Priority; - if ($Compare == 0) - { - $Compare = $a->Id <=> $b->Id; - } - - return $Compare; + return $a->Priority <=> $b->Priority || $a->Id <=> $b->Id; } sub CompareTaskStatus { - my $Compare = $b->Status cmp $a->Status; - if ($Compare == 0) - { - $Compare = $a->No <=> $b->No; - } - - return $Compare; + return $b->Status cmp $a->Status || $a->No <=> $b->No; } =pod

1 0