Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix erroneous assertions

1 files changed, 7 insertions, 4 deletions

diff --git a/win32/codepage.c b/win32/codepage.c
index 73645bc22b..b84909c10c 100644
--- a/win32/codepage.c
+++ b/win32/codepage.c
@@ -64,7 +64,7 @@ __forceinline static wchar_t *php_win32_cp_to_w_int(const char* in, size_t in_le
 	}
 
 	assert(ret ? tmp_len == ret_len : 1);
-	assert(ret ? wcslen(ret) == ret_len - 1 : 1);
+	assert(ret && !in_len ? wcslen(ret) == ret_len - 1 : 1);
 
 	ret[ret_len-1] = L'\0';
 
@@ -103,7 +103,10 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size
 {/*{{{*/
 	wchar_t *ret, *ret_idx;
 	const char *idx = in, *end;
-
+#if PHP_DEBUG
+	size_t save_in_len = in_len;
+#endif
+ 
 	assert(in && in_len ? in[in_len] == '\0' : 1);
 
 	if (!in) {
@@ -195,7 +198,7 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size
 
 	ret[in_len] = L'\0';
 
-	assert(ret ? wcslen(ret) == in_len : 1);
+	assert(ret && !save_in_len ? wcslen(ret) == in_len : 1);
 
 	if (PHP_WIN32_CP_IGNORE_LEN_P != out_len) {
 		*out_len = in_len;
@@ -239,7 +242,7 @@ __forceinline static char *php_win32_cp_from_w_int(const wchar_t* in, size_t in_
 	}
 
 	assert(target ? r == target_len : 1);
-	assert(target ? strlen(target) == target_len - 1 : 1);
+	assert(target && !in_len ? strlen(target) == target_len - 1 : 1);
 
 	target[target_len-1] = '\0';