Hugh McMaster : regedit: Prevent out-of-bounds reads when unescaping a string (Valgrind).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 976c2aa649a526188afd9c0647869ccc82068341
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=976c2aa649a526188afd9c0647...

Author: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Date:   Wed Jul 26 13:15:57 2017 +0000

regedit: Prevent out-of-bounds reads when unescaping a string (Valgrind).

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

---

 programs/regedit/regproc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 7e44e37..e0393cc 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -403,6 +403,7 @@ static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed)
                 str[val_idx] = str[str_idx];
                 break;
             default:
+                if (!str[str_idx]) return FALSE;
                 output_message(STRING_ESCAPE_SEQUENCE, str[str_idx]);
                 str[val_idx] = str[str_idx];
                 break;