From 637436628adc0c3c28d712be37902cb715c8a0b4 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 21 Dec 2016 17:58:34 +0100 Subject: [PATCH] fix possible null dereference --- win32/codepage.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/win32/codepage.c b/win32/codepage.c index 519ff03f4b..0cedda8f71 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -498,16 +498,18 @@ PW32CP const struct php_win32_cp *php_win32_cp_cli_do_setup(DWORD id) PW32CP const struct php_win32_cp *php_win32_cp_cli_do_restore(DWORD id) {/*{{{*/ - if (!id && orig_cp) { - id = orig_cp->id; + BOOL cli_io_restored = TRUE; + + if (orig_in_cp) { + cli_io_restored = cli_io_restored && SetConsoleCP(orig_in_cp->id); } - if (SetConsoleCP(orig_in_cp->id) && SetConsoleOutputCP(orig_out_cp->id)) { - if (orig_cp) { - return orig_cp; - } else { - return php_win32_cp_set_by_id(id); - } + if (orig_out_cp) { + cli_io_restored = cli_io_restored && SetConsoleOutputCP(orig_out_cp->id); + } + + if (cli_io_restored && id) { + return php_win32_cp_set_by_id(id); } return NULL; -- 2.50.1