]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 9 May 2019 14:56:57 +0000 (16:56 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 9 May 2019 14:56:57 +0000 (16:56 +0200)
* PHP-7.3:
  Fix erroneous assertions

1  2 
win32/codepage.c

index 636bc37992bf9e834363b555e941a28dc9b68b10,b84909c10c1b850c3fa43e34e088457c3d5766f9..86a4c330076d06ca35f6d9275c9e6d9f04198414
@@@ -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) {