fix #40915 (addcslashes unexpected behavior with binary input)

diff --git a/ext/standard/string.c b/ext/standard/string.c
index b4398818ea399b8900afd600616e5d5fd66a0528..e7102d0b03af6678badacd8841a6bc9b1827ef70 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4555,8 +4555,8 @@ PHP_FUNCTION(addcslashes)
                RETURN_STRINGL(str, str_len, 1);
        }
 
-       RETURN_STRING(php_addcslashes(str, str_len, &Z_STRLEN_P(return_value), 0,
-                                                                 what, what_len TSRMLS_CC), 0);
+       Z_STRVAL_P(return_value) = php_addcslashes(str, str_len, &Z_STRLEN_P(return_value), 0, what, what_len TSRMLS_CC);
+       RETURN_STRINGL(Z_STRVAL_P(return_value), Z_STRLEN_P(return_value), 0);
 }
 /* }}} */
 

diff --git a/ext/standard/tests/strings/bug40915.phpt b/ext/standard/tests/strings/bug40915.phpt
new file mode 100644 (file)
index 0000000..854853e
Binary files /dev/null and b/ext/standard/tests/strings/bug40915.phpt differ