wine-commits January 2023

wine-commits@winehq.org

1 participants
467 discussions

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

25 Jan '23

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

25 Jan '23

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

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

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

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

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 : 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 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 : 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

Conor McCarthy : vkd3d-shader/spirv: Pass a parser pointer to spirv_compiler_generate_spirv().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: vkd3d Branch: master Commit: d14f42be9df3c4de8e7f674e43ae02d107a57792 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d14f42be9df3c4de8e7f674e43ae0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 12:58:57 2023 +1000 vkd3d-shader/spirv: Pass a parser pointer to spirv_compiler_generate_spirv(). --- libs/vkd3d-shader/spirv.c | 14 ++++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 9 +-------- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0d0515de..417cdc92 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9577,7 +9577,7 @@ static bool is_dcl_instruction(enum vkd3d_shader_opcode handler_idx) || handler_idx == VKD3DSIH_HS_DECLS; } -int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, +static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { int ret = VKD3D_OK; @@ -9934,12 +9934,22 @@ int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, } int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, + struct vkd3d_shader_code *spirv) { + const struct vkd3d_shader_instruction_array *instructions = &parser->instructions; const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; + enum vkd3d_result result = VKD3D_OK; + unsigned int i; + + for (i = 0; i < instructions->count; ++i) + { + if ((result = spirv_compiler_handle_instruction(compiler, &instructions->elements[i])) < 0) + return result; + } if ((phase = spirv_compiler_get_current_shader_phase(compiler))) spirv_compiler_leave_shader_phase(compiler, phase); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 012b3eb6..f5038eb7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1176,7 +1176,6 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info struct vkd3d_shader_compile_info scan_info; struct spirv_compiler *spirv_compiler; struct vkd3d_shader_parser *parser; - unsigned int i; int ret; scan_info = *compile_info; @@ -1234,13 +1233,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - for (i = 0; i < parser->instructions.count && ret >= 0; ++i) - { - ret = spirv_compiler_handle_instruction(spirv_compiler, &parser->instructions.elements[i]); - } - - if (ret >= 0) - ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, out); + ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, parser, out); spirv_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b5f45834..6c5a1917 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1144,10 +1144,9 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version * const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location); -int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction); int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, + struct vkd3d_shader_code *spirv); void spirv_compiler_destroy(struct spirv_compiler *compiler); void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2023