From c9b1ff5080edaa4c19d8324734c3e272abf0b032 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Mon, 26 Mar 2007 10:23:50 +0000
Subject: [PATCH] fix #40915 (addcslashes unexpected behavior with binary
 input)

---
 ext/standard/string.c                    |   4 ++--
 ext/standard/tests/strings/bug40915.phpt | Bin 0 -> 468 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 ext/standard/tests/strings/bug40915.phpt

diff --git a/ext/standard/string.c b/ext/standard/string.c
index b4398818ea..e7102d0b03 100644
--- 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
index 0000000000000000000000000000000000000000..854853ed2e3dd633d449948e0312c428331a9ee9
GIT binary patch
literal 468
zcmb`CK}!QM5QTene#H<yY`{RoN|Ck})GY`egl?gS1xYud31~L#ZmRCDH`%qW9ts{j
z&YL&id&5|kt}@2p*6;9i%&#x5FcDG~^^2&rs?l5Z?o`nziCd+`-jo%-nMUK*SW$hT
zvCcOX7+XF(rhzkCIPCz=>ZZauCcTRik#o*lG6mR+>RI|%7gN4MlIW&%`fGP+&@Img
z68WpKPdw_z82W?Tc3@D2E|J`qR^>L-UEGA%(#=zPmn|7PfpBB&E*VpdFSX<#Tt;Cu
d%#+^0c|K^}(I^TLAGqspFnDW<QmTIee*$(7jluu`

literal 0
HcmV?d00001

-- 
2.50.1