- Wine-Commits - list.winehq.org

Fabian Maurer : d2d1_1: Don't redefine D2D1_PROPERTY_BINDING (gcc 4.3).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 0de8f53b3bb6a5256808638cb98f468a7990b3f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0de8f53b3bb6a5256808638cb98f46… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:32:14 2022 +0100 d2d1_1: Don't redefine D2D1_PROPERTY_BINDING (gcc 4.3). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/d2d1_1.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index b60064be3b6..9da56050ecb 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -157,7 +157,7 @@ typedef enum D2D1_LAYER_OPTIONS1 D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, } D2D1_LAYER_OPTIONS1; -typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +struct D2D1_PROPERTY_BINDING; typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef enum D2D1_PROPERTY_TYPE @@ -936,14 +936,14 @@ interface ID2D1Factory1 : ID2D1Factory HRESULT RegisterEffectFromStream( [in] REFCLSID effect_id, [in] IStream *property_xml, - [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings, [in] UINT32 binding_count, [in] PD2D1_EFFECT_FACTORY effect_factory ); HRESULT RegisterEffectFromString( [in] REFCLSID effect_id, [in] const WCHAR *property_xml, - [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings, [in] UINT32 binding_count, [in] PD2D1_EFFECT_FACTORY effect_factory );

1 0

Alex Henrie : dbghelp: Handle memory allocation failure in image_locate_build_id_target (cppcheck).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 7a441eafb4f4b42a48b95e151fe2a3c2c7b59471 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a441eafb4f4b42a48b95e151fe2a3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 21:58:41 2022 -0700 dbghelp: Handle memory allocation failure in image_locate_build_id_target (cppcheck). --- dlls/dbghelp/module.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 51ade962937..c0c47b859f4 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -660,6 +660,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); + if (!p) goto fail; wcscpy(p, L"/usr/lib/debug/.build-id/"); z = p + wcslen(p); if (idlen) @@ -684,9 +685,11 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); if (sz) { - p = realloc(p, sz * sizeof(WCHAR) + + z = realloc(p, sz * sizeof(WCHAR) + sizeof(L"\\.cache\\debuginfod_client\\") + idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); + if (!z) goto fail; + p = z; GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); z = p + sz - 1; wcscpy(z, L"\\.cache\\debuginfod_client\\"); @@ -703,6 +706,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE } TRACE("not found\n"); +fail: free(p); HeapFree(GetProcessHeap(), 0, fmap_link); return FALSE;

1 0

Alex Henrie : twain_32: Handle realloc failure in twain_add_onedriver (cppcheck).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 3e5a956563213b7c5a22d33445019b0e98a22e66 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e5a956563213b7c5a22d33445019b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:50:34 2022 -0700 twain_32: Handle realloc failure in twain_add_onedriver (cppcheck). --- dlls/twain_32/dsm_ctrl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 6854093017a..13503e6772c 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -53,6 +53,7 @@ twain_add_onedriver(const WCHAR *dsname) { DSENTRYPROC dsEntry; TW_IDENTITY fakeOrigin; TW_IDENTITY sourceId; + struct all_devices *new_devices; TW_UINT16 ret; WCHAR path[MAX_PATH]; @@ -89,7 +90,10 @@ twain_add_onedriver(const WCHAR *dsname) { } if (i < nrdevices) break; - devices = realloc( devices, sizeof(devices[0])*(nrdevices+1) ); + new_devices = realloc( devices, sizeof(devices[0]) * (nrdevices + 1) ); + if (!new_devices) + break; + devices = new_devices; devices[nrdevices].modname = wcsdup( path ); devices[nrdevices].identity = sourceId; nrdevices++;

1 0

Alex Henrie : hhctrl: Handle memory allocation failure in ReadChmSystem (cppcheck).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 88a5c64b9369baa592163e3cdafe1570a17fcabc URL: https://gitlab.winehq.org/wine/wine/-/commit/88a5c64b9369baa592163e3cdafe15… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:15:04 2022 -0700 hhctrl: Handle memory allocation failure in ReadChmSystem (cppcheck). --- dlls/hhctrl.ocx/chm.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index fb982303a3c..4be86bd165a 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -82,7 +82,7 @@ static BOOL ReadChmSystem(CHMInfo *chm) { IStream *stream; DWORD ver=0xdeadbeef, read, buf_size; - char *buf; + char *buf, *new_buf; HRESULT hres; struct { @@ -101,16 +101,27 @@ static BOOL ReadChmSystem(CHMInfo *chm) IStream_Read(stream, &ver, sizeof(ver), &read); TRACE("version is %lx\n", ver); - buf = malloc(8 * sizeof(DWORD)); - buf_size = 8*sizeof(DWORD); + buf_size = 8 * sizeof(DWORD); + buf = malloc(buf_size); + if(!buf) { + IStream_Release(stream); + return FALSE; + } while(1) { hres = IStream_Read(stream, &entry, sizeof(entry), &read); if(hres != S_OK) break; - if(entry.len > buf_size) - buf = realloc(buf, buf_size=entry.len); + if(entry.len > buf_size) { + new_buf = realloc(buf, entry.len); + if(!new_buf) { + hres = E_OUTOFMEMORY; + break; + } + buf = new_buf; + buf_size = entry.len; + } hres = IStream_Read(stream, buf, entry.len, &read); if(hres != S_OK)

1 0

Alex Henrie : inetcomm: Fix memory leak on realloc failure in copy_headers_to_buf (cppcheck).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 1afa20ae679d7ee4587f19b1cc22b1a9525decd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1afa20ae679d7ee4587f19b1cc22b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:24:30 2022 -0700 inetcomm: Fix memory leak on realloc failure in copy_headers_to_buf (cppcheck). --- dlls/inetcomm/mimeole.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 232e09aa075..dd2c00b01fa 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -485,7 +485,7 @@ static inline propschema *impl_from_IMimePropertySchema(IMimePropertySchema *ifa */ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) { - char *buf = NULL; + char *buf = NULL, *new_buf; DWORD size = PARSER_BUF_SIZE, offset = 0, last_end = 0; HRESULT hr; BOOL done = FALSE; @@ -497,18 +497,14 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) char *end; DWORD read; - if(!buf) - buf = malloc(size + 1); - else - { - size *= 2; - buf = realloc(buf, size + 1); - } - if(!buf) + if(buf) size *= 2; + new_buf = realloc(buf, size + 1); + if(!new_buf) { hr = E_OUTOFMEMORY; goto fail; } + buf = new_buf; hr = IStream_Read(stm, buf + offset, size - offset, &read); if(FAILED(hr)) goto fail;

1 0

Alex Henrie : hhctrl: Handle memory allocation failure in SearchCHM_File (cppcheck).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 02d4647c9bae526e8008ddbd2f9fe99572053350 URL: https://gitlab.winehq.org/wine/wine/-/commit/02d4647c9bae526e8008ddbd2f9fe9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:20:32 2022 -0700 hhctrl: Handle memory allocation failure in SearchCHM_File (cppcheck). --- dlls/hhctrl.ocx/search.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index c6fe30afc14..64b71e87ac7 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -72,7 +72,7 @@ static void fill_search_tree(HWND hwndList, SearchItem *item) */ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char *needle) { - char *buffer = malloc(BLOCK_SIZE); + char *buffer = NULL, *new_buffer; strbuf_t content, node, node_name; IStream *temp_stream = NULL; DWORD i, buffer_size = 0; @@ -84,7 +84,7 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * hres = IStorage_OpenStream(pStorage, file, NULL, STGM_READ, 0, &temp_stream); if(FAILED(hres)) { FIXME("Could not open '%s' stream: %08lx\n", debugstr_w(file), hres); - goto cleanup; + return NULL; } strbuf_init(&node); @@ -110,7 +110,9 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * title[wlen] = 0; } - buffer = realloc(buffer, buffer_size + textlen + 1); + new_buffer = realloc(buffer, buffer_size + textlen + 1); + if(!new_buffer) goto cleanup; + buffer = new_buffer; memcpy(&buffer[buffer_size], text, textlen); buffer[buffer_size + textlen] = '\0'; buffer_size += textlen; @@ -130,14 +132,14 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * if(strstr(buffer, needle)) found = TRUE; +cleanup: strbuf_free(&node); strbuf_free(&content); strbuf_free(&node_name); -cleanup: free(buffer); - if(temp_stream) - IStream_Release(temp_stream); + IStream_Release(temp_stream); + if(!found) { free(title);

1 0

Fabian Maurer : wldap32: Set error code in error cases (Coverity).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 89f1d626dc29b24a9dbec6e0a1e5b05e7b6c6439 URL: https://gitlab.winehq.org/wine/wine/-/commit/89f1d626dc29b24a9dbec6e0a1e5b0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 17:12:13 2022 +0100 wldap32: Set error code in error cases (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wldap32/misc.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index a8d27a87b78..f515698d095 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -218,13 +218,19 @@ WCHAR * CDECL ldap_first_attributeW( LDAP *ld, WLDAP32_LDAPMessage *entry, WLDAP if (ld && entry) retU = ldap_first_attribute( CTX(ld), MSG(entry), &berU ); else return NULL; - if (retU && (ber = malloc( sizeof(*ber) ))) + if (!retU) + return NULL; + + if (!(ber = malloc( sizeof(*ber) ))) { - ber->opaque = (char *)berU; - *ptr = ber; - ret = strUtoW( retU ); + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + ldap_memfree( retU ); + return NULL; } + ber->opaque = (char *)berU; + *ptr = ber; + ret = strUtoW( retU ); ldap_memfree( retU ); return ret; } @@ -358,12 +364,18 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry( LDAP *ld, WLDAP32_LDAPMessa if (entry->lm_next) return entry->lm_next; msgU = ldap_next_entry( CTX(ld), MSG(entry) ); - if (msgU && (msg = calloc( 1, sizeof(*msg) ))) + + if (!msgU) + return NULL; + + if (!(msg = calloc( 1, sizeof(*msg) ))) { - MSG(msg) = msgU; - entry->lm_next = msg; + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; } + MSG(msg) = msgU; + entry->lm_next = msg; return msg; } @@ -382,12 +394,18 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_reference( LDAP *ld, WLDAP32_LDAPM if (entry->lm_next) return entry->lm_next; msgU = ldap_next_reference( CTX(ld), MSG(entry) ); - if (msgU && (msg = calloc( 1, sizeof(*msg) ))) + + if (!msgU) + return NULL; + + if (!(msg = calloc( 1, sizeof(*msg) ))) { - MSG(msg) = msgU; - entry->lm_next = msg; + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; } + MSG(msg) = msgU; + entry->lm_next = msg; return msg; }

1 0

Alex Henrie : msi: Fix memory leak on realloc failure in search_directory (cppcheck).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: d394df4a30feb685927908fce2887bf5496b5d66 URL: https://gitlab.winehq.org/wine/wine/-/commit/d394df4a30feb685927908fce2887b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:36:56 2022 -0700 msi: Fix memory leak on realloc failure in search_directory (cppcheck). --- dlls/msi/appsearch.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 9693fc92833..95c3312b3df 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -875,7 +875,7 @@ static UINT search_directory( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHA { UINT rc; DWORD attr; - LPWSTR val = NULL; + WCHAR *val = NULL, *new_val; TRACE("%p, %p, %s, %d, %p\n", package, sig, debugstr_w(path), depth, appValue); @@ -920,11 +920,18 @@ static UINT search_directory( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHA if (attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY) && val && val[lstrlenW(val) - 1] != '\\') { - val = realloc(val, (wcslen(val) + 2) * sizeof(WCHAR)); - if (!val) + new_val = realloc(val, (wcslen(val) + 2) * sizeof(WCHAR)); + if (!new_val) + { + free(val); + val = NULL; rc = ERROR_OUTOFMEMORY; + } else + { + val = new_val; PathAddBackslashW(val); + } } *appValue = val;

1 0

Alex Henrie : mshtml: Handle memory allocation failure in set_statustext.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 4a8b12a1f6c178ba9526bce46b0902053dbdff62 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a8b12a1f6c178ba9526bce46b0902… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 21:10:02 2022 -0700 mshtml: Handle memory allocation failure in set_statustext. --- dlls/mshtml/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 14c34f2f36a..a45a2c111dc 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -407,6 +407,7 @@ void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) if(!p) { len = 255; p = malloc(len * sizeof(WCHAR)); + if (!p) return; len = LoadStringW(hInst, id, p, len) + 1; p = realloc(p, len * sizeof(WCHAR)); if(InterlockedCompareExchangePointer((void**)&status_strings[index], p, NULL)) { @@ -420,6 +421,7 @@ void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) len = lstrlenW(p) + lstrlenW(arg) - 1; buf = malloc(len * sizeof(WCHAR)); + if (!buf) return; swprintf(buf, len, p, arg);

1 0

Alex Henrie : msi: Fix memory leak on realloc failure in msi_get_window_text (cppcheck).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 6c1dd0f2c5669e084eb1f84571c38761a97c0970 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c1dd0f2c5669e084eb1f84571c387… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 21:28:03 2022 -0700 msi: Fix memory leak on realloc failure in msi_get_window_text (cppcheck). --- dlls/msi/dialog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index e5a2208cb6f..cfd39d4921c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -143,7 +143,7 @@ static HWND hMsiHiddenWindow; static LPWSTR msi_get_window_text( HWND hwnd ) { UINT sz, r; - LPWSTR buf; + WCHAR *buf, *new_buf; sz = 0x20; buf = malloc( sz * sizeof(WCHAR) ); @@ -153,7 +153,10 @@ static LPWSTR msi_get_window_text( HWND hwnd ) if ( r < (sz - 1) ) break; sz *= 2; - buf = realloc( buf, sz * sizeof(WCHAR) ); + new_buf = realloc( buf, sz * sizeof(WCHAR) ); + if ( !new_buf ) + free( buf ); + buf = new_buf; } return buf;

1 0