[PATCH 2/3] regedit: Check if any hex data exists before attempting to parse it

Hugh McMaster hugh.mcmaster at outlook.com
Wed Jul 5 08:33:02 CDT 2017


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/regproc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 74f0640472..e94d14e0fe 100644
--- 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;
-- 
2.11.0




More information about the wine-patches mailing list