com php-src: Merge branch 'PHP-7.3' into PHP-7.4: win32/codepage.c
| From: | Christoph Michael Becker | Date: | Thu, 09 May 2019 14:56:57 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: win32/codepage.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106101@lists.php.net to get a copy of this message | ||
Commit: d0d290d4aa9b0c16759b6aa22e7e5bf1c944a892
Author: Christoph M. Becker <cmbecker69@gmx.de> Thu, 9 May 2019 16:56:57 +0200
Parents: 0025a39b4521ef05105f989c42b25e0852484cc0 fd1ffa4692dd91af08ea019fc2db0d8b3835dfe9
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0d290d4aa9b0c16759b6aa22e7e5bf1c944a892
Log:
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix erroneous assertions
Changed paths:
MM win32/codepage.c
Diff:
diff --cc win32/codepage.c
index 636bc37,b84909c..86a4c33
--- 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) {