Module: wine Branch: master Commit: aa9d2a7c178ec8b865a66cd81c31286845500de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9d2a7c178ec8b865a66cd81c...
Author: Hugh McMaster hugh.mcmaster@outlook.com Date: Mon Feb 15 23:15:35 2016 +1100
reg: Abort the process if get_regdata returns NULL.
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/reg/reg.c | 7 +++++-- programs/reg/tests/reg.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ce28749..20de804 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -379,8 +379,11 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; }
- if (data) - reg_data = get_regdata(data,reg_type,separator,®_count); + if (data && !(reg_data = get_regdata(data, reg_type, separator, ®_count))) + { + RegCloseKey(subkey); + return 1; + }
RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count); HeapFree(GetProcessHeap(),0,reg_data); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index aedca14..80fc7d3 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -215,11 +215,11 @@ static void test_add(void) verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_BINARY /v bin4 /f /d DeAdBeEf0DD", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -260,9 +260,9 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
@@ -314,43 +314,43 @@ static void test_add(void)
/* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d "three\0little\0strings" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); memcpy(buffer, "three\0little\0strings\0", 22); - verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s "#" /d "three#little#strings" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d "" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s "#" /d "threelittlestrings" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s "#randomgibberish" /d "three#little#strings" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s "\0" /d "three\0little\0strings" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s "" /d "three#little#strings" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s "#" /d "##" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s "#" /d "two##strings" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s "#" /d "#a" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r);
run_reg_exe("reg add HKCU\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s "#" /d "a#" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); buffer[0]='a'; buffer[1]=0; buffer[2]=0; - verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE);
run_reg_exe("reg add HKCU\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);