cvs: php-src(PHP_5_2) / NEWS /ext/standard var.c /ext/standard/tests/strings bug37262.phpt explode.phpt

iliaa Mon Oct 9 18:08:34 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings bug37262.phpt Modified files: /php-src NEWS /php-src/ext/standard/tests/strings explode.phpt /php-src/ext/standard var.c Log: Fixed bug #37262 (var_export() does not escape \0 character). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.295&r2=1.2027.2.547.2.296&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.295 php-src/NEWS:1.2027.2.547.2.296 --- php-src/NEWS:1.2027.2.547.2.295 Mon Oct 9 16:20:46 2006 +++ php-src/NEWS Mon Oct 9 18:08:33 2006 @@ -4,6 +4,7 @@ - Fixed PECL bug #8816 (issue in php_oci_statement_fetch with more than one piecewise column) (jeff at badtz-maru dot com, Tony) - Fixed bug #39067 (getDeclaringClass() and private properties). (Tony) +- Fixed bug #37262 (var_export() does not escape \0 character). (Ilia) 05 Oct 2006, PHP 5.2.0RC5 - Updated bundled OpenSSL to version 0.9.8d in the Windows distro. (Edin) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.4&r2=1.4.4.1&diff_format=u Index: php-src/ext/standard/tests/strings/explode.phpt diff -u php-src/ext/standard/tests/strings/explode.phpt:1.4 php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1 --- php-src/ext/standard/tests/strings/explode.phpt:1.4 Sun Jul 18 11:34:28 2004 +++ php-src/ext/standard/tests/strings/explode.phpt Mon Oct 9 18:08:34 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.203.2.7.2.7&r2=1.203.2.7.2.8&diff_format=u Index: php-src/ext/standard/var.c diff -u php-src/ext/standard/var.c:1.203.2.7.2.7 php-src/ext/standard/var.c:1.203.2.7.2.8 --- php-src/ext/standard/var.c:1.203.2.7.2.7 Tue Jul 25 16:41:04 2006 +++ php-src/ext/standard/var.c Mon Oct 9 18:08:34 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.203.2.7.2.7 2006/07/25 16:41:04 bjori Exp $ */ +/* $Id: var.c,v 1.203.2.7.2.8 2006/10/09 18:08:34 iliaa Exp $ */ @@ -416,7 +416,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 ("'"); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug37262.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/bug37262.phpt +++ php-src/ext/standard/tests/strings/bug37262.phpt