Commit 8abec735 authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard

reg: Dynamically allocate memory for the value name buffer when deleting all…

reg: Dynamically allocate memory for the value name buffer when deleting all registry values in a specified key. Signed-off-by: 's avatarHugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f95f3fb1
...@@ -482,40 +482,35 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name ...@@ -482,40 +482,35 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
if (value_all) if (value_all)
{ {
LPWSTR szValue; DWORD max_value_len = 256, value_len;
DWORD maxValue; WCHAR *value_name;
DWORD count;
LONG rc; LONG rc;
rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, value_name = heap_xalloc(max_value_len * sizeof(WCHAR));
NULL, &maxValue, NULL, NULL, NULL);
if (rc != ERROR_SUCCESS)
{
RegCloseKey(key);
output_message(STRING_GENERAL_FAILURE);
return 1;
}
maxValue++;
szValue = heap_xalloc(maxValue * sizeof(WCHAR));
while (1) while (1)
{ {
count = maxValue; value_len = max_value_len;
rc = RegEnumValueW(key, 0, szValue, &count, NULL, NULL, NULL, NULL); rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL);
if (rc == ERROR_SUCCESS) if (rc == ERROR_SUCCESS)
{ {
rc = RegDeleteValueW(key, szValue); rc = RegDeleteValueW(key, value_name);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
heap_free(szValue); heap_free(value_name);
RegCloseKey(key); RegCloseKey(key);
output_message(STRING_VALUEALL_FAILED, key_name); output_message(STRING_VALUEALL_FAILED, key_name);
return 1; return 1;
} }
} }
else if (rc == ERROR_MORE_DATA)
{
max_value_len *= 2;
value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR));
}
else break; else break;
} }
heap_free(szValue); heap_free(value_name);
} }
else if (value_name || value_empty) else if (value_name || value_empty)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment