October 2012 - Wine-commits

André Hentschel : usp10: Avoid memory leak in ScriptTextOut (coverity).
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 4ee73e69b5e7a01852967f6609a551b01c0311d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee73e69b5e7a01852967f660… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:06:57 2012 +0100 usp10: Avoid memory leak in ScriptTextOut (coverity). --- dlls/usp10/usp10.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9bd55b4..7f181d0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3246,7 +3246,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); if (!rtlGlyphs) + { + heap_free(lpDx); return E_OUTOFMEMORY; + } for (i = 0; i < cGlyphs; i++) rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i];

1 0

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

31 Oct '12

Module: wine Branch: master Commit: 42f791ccd561f9188109dd000940536849919f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f791ccd561f9188109dd000… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:15 2012 +0100 wineps: Avoid memory leaks (coverity). --- dlls/wineps.drv/download.c | 7 ++++--- dlls/wineps.drv/ps.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 037ea34..f984225 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -313,9 +313,10 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) UINT emsize; if (!get_bbox(dev->hdc, &bbox, &emsize)) { - HeapFree(GetProcessHeap(), 0, potm); - return FALSE; - } + HeapFree(GetProcessHeap(), 0, ps_name); + HeapFree(GetProcessHeap(), 0, potm); + return FALSE; + } if(!is_room_for_font(physDev)) PSDRV_EmptyDownloadList(dev, TRUE); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index b6bbe7a..35a55f0 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -385,6 +385,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) strlen(escaped_title) + 30 ); if(!buf) { WARN("HeapAlloc failed\n"); + HeapFree(GetProcessHeap(), 0, escaped_title); return 0; }

1 0

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

31 Oct '12

Module: wine Branch: master Commit: 585a66a46320dc8bba7771ec147ef3d7a800310e URL: http://source.winehq.org/git/wine.git/?a=commit;h=585a66a46320dc8bba7771ec1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:22 2012 +0100 winex11: Avoid memory leaks (coverity). --- dlls/winex11.drv/clipboard.c | 1 + dlls/winex11.drv/xrender.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 37a115e..bd3ef7b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2400,6 +2400,7 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (!tmp) { HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, prop_data); return FALSE; } diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d7f0508..389f684 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1405,9 +1405,9 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type form pXRenderAddGlyphs(gdi_display, formatEntry->glyphset, &gid, &gi, 1, buflen ? buf : zero, buflen ? buflen : sizeof(zero)); - HeapFree(GetProcessHeap(), 0, buf); } + HeapFree(GetProcessHeap(), 0, buf); formatEntry->gis[glyph] = gi; }

1 0

André Hentschel : wininet: Fix WININET_SetAuthorization on error path (coverity).
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 5010f0933e496bb367fe2b1414fb000a46bd83d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5010f0933e496bb367fe2b141… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:25 2012 +0100 wininet: Fix WININET_SetAuthorization on error path (coverity). --- dlls/wininet/dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a3235a4..418610d 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -188,7 +188,7 @@ static BOOL WININET_SetAuthorization( http_request_t *request, LPWSTR username, q = heap_strdupW(password); if( !q ) { - heap_free(username); + heap_free(p); return FALSE; }

1 0

André Hentschel : vbscript: Avoid memory leak in compile_select_statement (coverity).
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 1aa6236428ad4254d7024e023d8561b2abb47a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa6236428ad4254d7024e023… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:10 2012 +0100 vbscript: Avoid memory leak in compile_select_statement (coverity). --- dlls/vbscript/compile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 58afdf4..d324284 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -836,7 +836,7 @@ static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t * hres = push_instr_addr(ctx, OP_jmp, end_label); if(FAILED(hres)) - return hres; + break; } heap_free(case_labels);

1 0

Michael Stefaniuc : user32/test: Don't over-allocate memory for DDEDATA.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 2e31a44aca00bceb5e9a6495881adca9a8fc5a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e31a44aca00bceb5e9a64958… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 30 23:14:52 2012 +0100 user32/test: Don't over-allocate memory for DDEDATA. --- dlls/user32/tests/dde.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3ad48f0..e5d5554 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -143,7 +143,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA else lstrcpyA(str, "requested data\r\n"); - size = sizeof(DDEDATA) + lstrlenA(str) + 1; + size = FIELD_OFFSET(DDEDATA, Value[lstrlenA(str) + 1]); hglobal = GlobalAlloc(GMEM_MOVEABLE, size); ok(hglobal != NULL, "Expected non-NULL hglobal\n"); @@ -314,8 +314,7 @@ static void test_ddeml_client(void) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -336,8 +335,7 @@ todo_wine { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -357,8 +355,7 @@ todo_wine { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -483,8 +480,7 @@ todo_wine { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); - ok(size == 21 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 21, got %d\n", size); + ok(size == 19, "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);

1 0

Michael Stefaniuc : ole32/tests: Fix a memleak on an error path (Smatch).
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 470ad72b05a3159ce3d21c4a2ac7e54dd59052f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470ad72b05a3159ce3d21c4a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 30 23:15:44 2012 +0100 ole32/tests: Fix a memleak on an error path (Smatch). --- dlls/ole32/tests/propvariant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 769d49a..4d9a81b 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -445,6 +445,7 @@ static void test_varianttoproperty(void) if (len == 0xdeadbeef) { + HeapFree(GetProcessHeap(), 0, own_propvalue); return; }

1 0

Frédéric Delanoy : rpcrt4: Fix resources leaks.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 9c63a30c2591a3c75b8d431bc94b208e3c15153b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c63a30c2591a3c75b8d431bc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 31 09:43:46 2012 +0100 rpcrt4: Fix resources leaks. --- dlls/rpcrt4/rpc_transport.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 686ce68..aebb05e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1345,6 +1345,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (getsockname(sock, (struct sockaddr *)&sa, &sa_len)) { WARN("getsockname() failed: %s\n", strerror(errno)); + closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue; } @@ -1355,6 +1356,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret) { WARN("getnameinfo failed: %s\n", gai_strerror(ret)); + closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue; } @@ -2139,6 +2141,8 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) { HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); + HeapFree(GetProcessHeap(), 0, servername); ERR("InternetOpenW failed with error %d\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -2153,6 +2157,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) { HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); return RPC_S_OUT_OF_RESOURCES; } MultiByteToWideChar(CP_ACP, 0, httpc->common.NetworkAddr, -1, servername, strlen(httpc->common.NetworkAddr) + 1); @@ -2163,6 +2168,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); HeapFree(GetProcessHeap(), 0, servername); if (!httpc->session)

1 0

Jacek Caban : jscript: Fixed some leaks (coverity).
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 12adc677820f59a7d079eec26cf3a998a222f4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12adc677820f59a7d079eec26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 10:21:09 2012 +0100 jscript: Fixed some leaks (coverity). --- dlls/jscript/dispex.c | 4 +++- dlls/jscript/function.c | 4 +++- dlls/jscript/number.c | 4 +++- dlls/jscript/vbarray.c | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 211ed8a..2be474e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -901,8 +901,10 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd return E_OUTOFMEMORY; hres = init_dispex(ret, ctx, builtin_info ? builtin_info : &dispex_info, prototype); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(ret); return hres; + } *dispex = ret; return S_OK; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 4cac3d6..c5bcd2e 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -578,8 +578,10 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ hres = init_dispex_from_constr(&function->dispex, ctx, builtin_info, ctx->function_constr); else hres = init_dispex_from_constr(&function->dispex, ctx, &FunctionInst_info, ctx->function_constr); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(function); return hres; + } function->flags = flags; function->length = flags & PROPF_ARGMASK; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index b7a1a76..ed773a3 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -609,8 +609,10 @@ static HRESULT alloc_number(script_ctx_t *ctx, jsdisp_t *object_prototype, Numbe hres = init_dispex(&number->dispex, ctx, &Number_info, object_prototype); else hres = init_dispex_from_constr(&number->dispex, ctx, &NumberInst_info, ctx->number_constr); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(number); return hres; + } *ret = number; return S_OK; diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 5878866..7b9993b 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -184,6 +184,8 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un if(r) *r = jsval_obj(array); + else + jsdisp_release(array); return S_OK; }

1 0

Daniel Lehman : msvcp90: Update fpos<>::off instead of pos in stringbuf<>:: seekoff.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 64527285cf7fab1de5dbd2952df4eee5ecd3b02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64527285cf7fab1de5dbd2952… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Sep 28 15:16:17 2012 -0700 msvcp90: Update fpos<>::off instead of pos in stringbuf<>::seekoff. --- dlls/msvcp90/ios.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a11f90c..9435cb2 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3803,6 +3803,7 @@ fpos_int* __thiscall basic_stringbuf_char_seekoff(basic_stringbuf_char *this, this->seekhigh = cur_w; ret->off = 0; + ret->pos = 0; ret->state = 0; beg = basic_streambuf_char_eback(&this->base); @@ -3841,7 +3842,7 @@ fpos_int* __thiscall basic_stringbuf_char_seekoff(basic_stringbuf_char *this, off = -1; } - ret->pos = off; + ret->off = off; return ret; } @@ -4213,6 +4214,7 @@ fpos_int* __thiscall basic_stringbuf_wchar_seekoff(basic_stringbuf_wchar *this, this->seekhigh = cur_w; ret->off = 0; + ret->pos = 0; ret->state = 0; beg = basic_streambuf_wchar_eback(&this->base); @@ -4251,7 +4253,7 @@ fpos_int* __thiscall basic_stringbuf_wchar_seekoff(basic_stringbuf_wchar *this, off = -1; } - ret->pos = off; + ret->off = off; return ret; }

1 0