From: Anatol Belski <ab@php.net>
Date: Wed, 21 Dec 2016 16:58:34 +0000 (+0100)
Subject: fix possible null dereference
X-Git-Tag: php-7.1.1RC1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=637436628adc0c3c28d712be37902cb715c8a0b4;p=php

fix possible null dereference
---

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;