regedit: Check if any hex data exists before attempting to parse it.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

regedit: Check if any hex data exists before attempting to parse it.
1a4c3e5d · Hugh McMaster · Alexandre Julliard · 5cc1b227 · 1a4c3e5d
Commit 1a4c3e5d authored Jul 05, 2017 by Hugh McMaster Committed by Alexandre Julliard Jul 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

regproc.c programs/regedit/regproc.c +4 -1

No files found.
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -363,9 +363,12 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line)
            WCHAR *end;
            DWORD val;

+            if (!**line)
+                return FALSE;
+
            /* "hex(xx):" is special */
            val = wcstoul(*line, &end, 16);
-            if (!**line || *end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE))
+            if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE))
                return FALSE;

            parser->data_type = val;