From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 9 May 2019 14:56:57 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0d290d4aa9b0c16759b6aa22e7e5bf1c944a892;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix erroneous assertions
---

d0d290d4aa9b0c16759b6aa22e7e5bf1c944a892
diff --cc win32/codepage.c
index 636bc37992,b84909c10c..86a4c33007
--- a/win32/codepage.c
+++ b/win32/codepage.c
@@@ -105,8 -103,10 +105,12 @@@ PW32CP wchar_t *php_win32_cp_conv_ascii
  {/*{{{*/
  	wchar_t *ret, *ret_idx;
  	const char *idx = in, *end;
 +	char ch_err = 0;
 +
+ #if PHP_DEBUG
+ 	size_t save_in_len = in_len;
+ #endif
+  
  	assert(in && in_len ? in[in_len] == '\0' : 1);
  
  	if (!in) {