iliaa Mon Oct 9 18:09:43 2006 UTC
Modified files:
/php-src/ext/standard/tests/strings bug37262.phpt explode.phpt
/php-src/ext/standard var.c
Log:
MFB: Fixed bug #37262 (var_export() does not escape \0 character).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug37262.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/bug37262.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/bug37262.phpt:1.2
--- /dev/null Mon Oct 9 18:09:43 2006
+++ php-src/ext/standard/tests/strings/bug37262.phpt Mon Oct 9 18:09:42 2006
@@ -0,0 +1,9 @@
+--TEST--
+Bug #37262 (var_export() does not escape \0 character)
+--FILE--
+<?php
+$func = create_function('$a', 'return $a;');
+var_export($func);
+?>
+--EXPECT--
+'\000lambda_1'
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/strings/explode.phpt
diff -u php-src/ext/standard/tests/strings/explode.phpt:1.5
php-src/ext/standard/tests/strings/explode.phpt:1.6
--- php-src/ext/standard/tests/strings/explode.phpt:1.5 Tue Aug 16 10:18:43 2005
+++ php-src/ext/standard/tests/strings/explode.phpt Mon Oct 9 18:09:42 2006
@@ -29,7 +29,7 @@
var_dump(explode(":^:","a lazy dog:^:jumps::over:^:",-2));
?>
--EXPECTF--
-26d4e18734cb2582df5055e2175223df
+6e5d59d5afd6693547a733219d079658
bool(false)
bool(false)
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.246&r2=1.247&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.246 php-src/ext/standard/var.c:1.247
--- php-src/ext/standard/var.c:1.246 Sun Oct 8 13:34:24 2006
+++ php-src/ext/standard/var.c Mon Oct 9 18:09:42 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.246 2006/10/08 13:34:24 bjori Exp $ */
+/* $Id: var.c,v 1.247 2006/10/09 18:09:42 iliaa Exp $ */
@@ -543,7 +543,7 @@
php_printf("%.*G", (int) EG(precision), Z_DVAL_PP(struc));
break;
case IS_STRING:
- tmp_str = php_addcslashes(Z_STRVAL_PP(struc),
Z_STRLEN_PP(struc), &tmp_len, 0, "'\\", 2 TSRMLS_CC);
+ tmp_str = php_addcslashes(Z_STRVAL_PP(struc),
Z_STRLEN_PP(struc), &tmp_len, 0, "'\\\0", 3 TSRMLS_CC);
PUTS ("'");
PHPWRITE(tmp_str, tmp_len);
PUTS ("'");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
