https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8277eee6f447f9a4f980a2ac42c5e9ce4e5ca59
commit d8277eee6f447f9a4f980a2ac42c5e9ce4e5ca59 Author: winesync <[email protected]> AuthorDate: Sun Jan 16 21:17:20 2022 +0100 Commit: Thomas Csovcsity <[email protected]> CommitDate: Sun Jun 19 13:06:35 2022 +0200 [WINESYNC] reg: Allow the 'reg_data' pointer to be NULL. Signed-off-by: Hugh McMaster <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id e2dfb0aff42153f2c1a25e8c9b37ad10409aca36 by Hugh McMaster <[email protected]> --- base/applications/cmdutils/reg/add.c | 52 ++++++++++++++++++++---------------- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/base/applications/cmdutils/reg/add.c b/base/applications/cmdutils/reg/add.c index 9aaa3fc1acc..cb26c232de3 100644 --- a/base/applications/cmdutils/reg/add.c +++ b/base/applications/cmdutils/reg/add.c @@ -48,10 +48,10 @@ static inline BYTE hexchar_to_byte(WCHAR ch) return -1; } -static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *size_bytes) +static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, + BYTE **data_bytes, DWORD *size_bytes) { static const WCHAR empty; - LPBYTE out_data = NULL; *size_bytes = 0; @@ -64,8 +64,8 @@ static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWO case REG_EXPAND_SZ: { *size_bytes = (lstrlenW(data) + 1) * sizeof(WCHAR); - out_data = malloc(*size_bytes); - lstrcpyW((LPWSTR)out_data,data); + *data_bytes = malloc(*size_bytes); + lstrcpyW((WCHAR *)*data_bytes, data); break; } case REG_DWORD: @@ -77,41 +77,46 @@ static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWO val = wcstoul(data, &rest, (towlower(data[1]) == 'x') ? 16 : 10); if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { output_message(STRING_MISSING_INTEGER); - break; + return FALSE; } *size_bytes = sizeof(DWORD); - out_data = malloc(*size_bytes); - ((LPDWORD)out_data)[0] = val; + *data_bytes = malloc(*size_bytes); + *(DWORD *)*data_bytes = val; break; } case REG_BINARY: { - BYTE hex0, hex1; + BYTE hex0, hex1, *ptr; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); + *size_bytes = ((datalen + datalen % 2) / 2) * sizeof(BYTE); - out_data = malloc(*size_bytes); - if(datalen % 2) + *data_bytes = malloc(*size_bytes); + + if (datalen % 2) { hex1 = hexchar_to_byte(data[i++]); - if(hex1 == 0xFF) + if (hex1 == 0xFF) goto no_hex_data; - out_data[destByteIndex++] = hex1; + *data_bytes[destByteIndex++] = hex1; } - for(;i + 1 < datalen;i += 2) + + ptr = *data_bytes; + + for (; i + 1 < datalen; i += 2) { hex0 = hexchar_to_byte(data[i]); hex1 = hexchar_to_byte(data[i + 1]); - if(hex0 == 0xFF || hex1 == 0xFF) + if (hex0 == 0xFF || hex1 == 0xFF) goto no_hex_data; - out_data[destByteIndex++] = (hex0 << 4) | hex1; + ptr[destByteIndex++] = (hex0 << 4) | hex1; } break; + no_hex_data: - /* cleanup, print error */ - free(out_data); + free(*data_bytes); + *data_bytes = NULL; output_message(STRING_MISSING_HEXDATA); - out_data = NULL; - break; + return FALSE; } case REG_MULTI_SZ: { @@ -134,20 +139,21 @@ static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWO { free(buffer); output_message(STRING_INVALID_STRING); - return NULL; + return FALSE; } } buffer[destindex] = 0; if (destindex && buffer[destindex - 1]) buffer[++destindex] = 0; *size_bytes = (destindex + 1) * sizeof(WCHAR); - return (BYTE *)buffer; + *data_bytes = (BYTE *)buffer; + break; } default: output_message(STRING_UNHANDLED_TYPE, reg_type, data); } - return out_data; + return TRUE; } static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, @@ -194,7 +200,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - if (!(reg_data = get_regdata(data, data_type, separator, &data_size))) + if (!get_regdata(data, data_type, separator, ®_data, &data_size)) { RegCloseKey(hkey); return 1; diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 1c8ffb27672..af6646905bf 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: cf1e6d3f3fcb726062b957a973bb0a78b7e00eab + wine: e2dfb0aff42153f2c1a25e8c9b37ad10409aca36
