January 2023 - Wine-commits

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

25 Jan '23

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

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

25 Jan '23

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 : msi: Fix memory leak on realloc failure in create_diff_row_query (cppcheck).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 3e231d0f36a56ce991c7edbb6ae7845094e8417e URL: https://gitlab.winehq.org/wine/wine/-/commit/3e231d0f36a56ce991c7edbb6ae784… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 21:23:50 2022 -0700 msi: Fix memory leak on realloc failure in create_diff_row_query (cppcheck). --- dlls/msi/database.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c0845fbadcb..c50e34cc8cd 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1412,7 +1412,7 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, LPWSTR table, MSIRECORD *rec) { - LPWSTR query = NULL, clause = NULL, val; + WCHAR *query = NULL, *clause = NULL, *new_clause, *val; LPCWSTR setptr, key; DWORD size, oldsize; MSIRECORD *keys; @@ -1422,10 +1422,6 @@ static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, if (r != ERROR_SUCCESS) return NULL; - clause = calloc(1, sizeof(WCHAR)); - if (!clause) - goto done; - size = 1; count = MSI_RecordGetFieldCount(keys); for (i = 1; i <= count; i++) @@ -1440,12 +1436,13 @@ static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, oldsize = size; size += lstrlenW(setptr) + lstrlenW(key) + lstrlenW(val) - 4; - clause = realloc(clause, size * sizeof(WCHAR)); - if (!clause) + new_clause = realloc(clause, size * sizeof(WCHAR)); + if (!new_clause) { free(val); goto done; } + clause = new_clause; swprintf(clause + oldsize - 1, size - (oldsize - 1), setptr, key, val); free(val);

1 0

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

25 Jan '23

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

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

25 Jan '23

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 25 Jan '23

25 Jan '23

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

Fabian Maurer : wldap32: Free resource in error case and return error code (Coverity).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 0408d3a800137f00812a21004b54689fda34e016 URL: https://gitlab.winehq.org/wine/wine/-/commit/0408d3a800137f00812a21004b5468… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 20:43:09 2022 +0100 wldap32: Free resource in error case and return error code (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wldap32/misc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index edf1f196353..a8d27a87b78 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -413,12 +413,18 @@ ULONG CDECL WLDAP32_ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_time ret = ldap_result( CTX(ld), msgid, all, timeout ? &timeval : NULL, &msgU ); } - if (msgU && (msg = calloc( 1, sizeof(*msg) ))) + + if (!msgU) + return ret; + + if (!(msg = calloc( 1, sizeof(*msg) ))) { - MSG(msg) = msgU; - *res = msg; + free( msgU ); + return WLDAP32_LDAP_NO_MEMORY; } + MSG(msg) = msgU; + *res = msg; return ret; }

1 0

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

25 Jan '23

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 : winspool: Improve the grammar of a comment in get_servername_from_name.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: a8e2aa6c4bfbaa46fa11bc32a7f2fd858a7f1a9f URL: https://gitlab.winehq.org/wine/wine/-/commit/a8e2aa6c4bfbaa46fa11bc32a7f2fd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 12 00:02:26 2022 -0700 winspool: Improve the grammar of a comment in get_servername_from_name. --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bc55d7f6d73..9ce3125787f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -887,7 +887,7 @@ static LPWSTR get_servername_from_name(LPCWSTR name) if (name == NULL) return NULL; if ((name[0] != '\\') || (name[1] != '\\')) return NULL; - server = wcsdup(&name[2]); /* skip over both backslash */ + server = wcsdup(&name[2]); /* skip over both backslashes */ if (server == NULL) return NULL; /* strip '\' and the printername */

1 0

Francisco Casas : tests: Test offset argument for the texture Load() method.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: 7a7b17d0e1ae2d0c9f600b4a064cb2e561c56c5c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7a7b17d0e1ae2d0c9f600b4a064cb… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Nov 18 11:37:24 2022 -0300 tests: Test offset argument for the texture Load() method. --- Makefile.am | 1 + tests/texture-load-offset.shader_test | 51 +++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/Makefile.am b/Makefile.am index 22b516b2..092223ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,6 +142,7 @@ vkd3d_shader_tests = \ tests/swizzle-6.shader_test \ tests/swizzle-7.shader_test \ tests/texture-load.shader_test \ + tests/texture-load-offset.shader_test \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ tests/uav.shader_test \ diff --git a/tests/texture-load-offset.shader_test b/tests/texture-load-offset.shader_test new file mode 100644 index 00000000..ab233c58 --- /dev/null +++ b/tests/texture-load-offset.shader_test @@ -0,0 +1,51 @@ +[require] +shader model >= 4.0 + +[texture 0] +size (3, 3) +0 0 0 1 1 0 0 1 2 0 0 1 +0 1 0 1 1 1 0 1 2 1 0 1 +0 2 0 1 1 2 0 1 2 2 0 1 + + +[pixel shader] +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return t.Load(int3(pos.xy, 0), int2(0, 1)); +} + + +[test] +draw quad +todo probe (0, 0) rgba (0, 1, 0, 1) +todo probe (1, 0) rgba (1, 1, 0, 1) +todo probe (0, 1) rgba (0, 2, 0, 1) +todo probe (1, 1) rgba (1, 2, 0, 1) + + +[pixel shader] +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return t.Load(int3(pos.xy, 0), int2(-2, 0)); +} + + +[test] +draw quad +todo probe (3, 0) rgba (1, 0, 0, 1) +todo probe (4, 0) rgba (2, 0, 0, 1) +todo probe (3, 1) rgba (1, 1, 0, 1) +todo probe (4, 1) rgba (2, 1, 0, 1) + + +[pixel shader fail todo] +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return t.Load(int3(pos.xy, 0), int2(8, 1)); +}

1 0