From: Anatol Belski <ab@php.net>
Date: Mon, 12 Feb 2018 21:57:32 +0000 (+0100)
Subject: Revert "Improve conversion loop"
X-Git-Tag: php-7.3.0alpha1~444
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7f65f30a004a45e2ae8bf029b362418b26d048a;p=php

Revert "Improve conversion loop"

This reverts commit 7a4573a55ad244b66c40b4086e432775b6f185b7.

Don't read over '\0'.
---

diff --git a/win32/ioutil.h b/win32/ioutil.h
index c413b78b2a..41773b306e 100644
--- a/win32/ioutil.h
+++ b/win32/ioutil.h
@@ -376,7 +376,7 @@ __forceinline static FILE *php_win32_ioutil_fopen(const char *patha, const char
 {/*{{{*/
 	FILE *ret;
 	wchar_t modew[16] = {0};
-	int err = 0, i;
+	int err = 0, i = 0;
 
 	PHP_WIN32_IOUTIL_INIT_W(patha)
 	if (!pathw) {
@@ -386,8 +386,9 @@ __forceinline static FILE *php_win32_ioutil_fopen(const char *patha, const char
 
 	PHP_WIN32_IOUTIL_CHECK_PATH_W(pathw, NULL, 1)
 
-	for (i = 0; i < (sizeof(modew)-1)/sizeof(wchar_t); i++) {
+	while (i < (sizeof(modew)-1)/sizeof(wchar_t) && modea[i]) {
 		modew[i] = (wchar_t)modea[i];
+		i++;
 	}
 
 	ret = php_win32_ioutil_fopen_w(pathw, modew);