derick Sun Dec 9 16:54:30 2007 UTC
Added files:
/php-src/ext/standard/tests/general_functions bug42272.phpt
Modified files:
/php-src/ext/standard var.c
/php-src/ext/standard/tests/general_functions
var_export-locale.phpt
var_export.phpt
/php-src/ext/standard/tests/strings bug37262.phpt
Log:
- Fixed Bug #42272 (var_export() incorrectly escapes char(0)).
- Also fixed var_export() in unicode mode, as the function would actually
generate non-parsable strings which defeats the purpose of var_export().
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.271&r2=1.272&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.271 php-src/ext/standard/var.c:1.272
--- php-src/ext/standard/var.c:1.271 Fri Nov 2 09:43:04 2007
+++ php-src/ext/standard/var.c Sun Dec 9 16:54:30 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.271 2007/11/02 09:43:04 jani Exp $ */
+/* $Id: var.c,v 1.272 2007/12/09 16:54:30 derick Exp $ */
/* {{{ includes
*/
@@ -520,6 +520,7 @@
int i = 0;
char buf[10];
int buf_len;
+ int state = 0; /* 0 = in single quotes, 1 = in double quotes */
/*
* We export all codepoints > 128 in escaped form to avoid encoding
issues
@@ -529,10 +530,18 @@
U16_NEXT(ustr, i, ustr_len, cp);
switch (cp) {
case 0x0: /* '\0' */
- PHPWRITE("\\000", 4);
+ if (state == 0) {
+ PHPWRITE("' . \"", 5);
+ state = 1;
+ }
+ PHPWRITE("\\0", 2);
break;
case 0x27: /* '\'' */
+ if (state == 1) {
+ PHPWRITE("\" . '", 5);
+ state = 0;
+ }
PHPWRITE("\\'", 2);
break;
@@ -542,25 +551,40 @@
default:
if ((uint32_t)cp < 128) {
+ if (state == 1) {
+ PHPWRITE("\" . '", 5);
+ state = 0;
+ }
buf[0] = (char) (short) cp;
buf_len = 1;
} else if (U_IS_BMP(cp)) {
+ if (state == 0) {
+ PHPWRITE("' . \"", 5);
+ state = 1;
+ }
buf_len = snprintf(buf, sizeof(buf),
"\\u%04X", cp);
} else {
+ if (state == 0) {
+ PHPWRITE("' . \"", 5);
+ state = 1;
+ }
buf_len = snprintf(buf, sizeof(buf),
"\\u%06X", cp);
}
PHPWRITE(buf, buf_len);
break;
}
}
+ if (state == 1) { // if we are in double quotes, go back to single */
+ PHPWRITE("\" . '", 5);
+ }
}
/* }}} */
PHPAPI void php_var_export(zval **struc, int level TSRMLS_DC) /* {{{ */
{
HashTable *myht;
- char* tmp_str;
- int tmp_len;
+ char *tmp_str, *tmp_str2;
+ int tmp_len, tmp_len2;
zstr class_name;
zend_uint class_name_len;
@@ -578,11 +602,13 @@
php_printf("%.*H", (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, "'\\\0", 3 TSRMLS_CC);
+ tmp_str = php_addcslashes(Z_STRVAL_PP(struc),
Z_STRLEN_PP(struc), &tmp_len, 0, "'\\", 2 TSRMLS_CC);
+ tmp_str2 = php_str_to_str_ex(tmp_str, tmp_len, "\0", 1, "' .
\"\\0\" . '", 12, &tmp_len2, 0, NULL);
PUTS ("'");
- PHPWRITE(tmp_str, tmp_len);
+ PHPWRITE(tmp_str2, tmp_len2);
PUTS ("'");
- efree (tmp_str);
+ efree(tmp_str2);
+ efree(tmp_str);
break;
case IS_UNICODE:
PUTS ("'");
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_export-locale.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/var_export-locale.phpt
diff -u php-src/ext/standard/tests/general_functions/var_export-locale.phpt:1.1
php-src/ext/standard/tests/general_functions/var_export-locale.phpt:1.2
--- php-src/ext/standard/tests/general_functions/var_export-locale.phpt:1.1
Tue Jun 19 12:19:27 2007
+++ php-src/ext/standard/tests/general_functions/var_export-locale.phpt Sun Dec
9 16:54:30 2007
@@ -572,9 +572,9 @@
Iteration 12
-'\000'
-'\000'
-string(6) "'\000'"
+'' . "\0" . ''
+'' . "\0" . ''
+string(14) "'' . "\0" . ''"
Iteration 13
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_export.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/general_functions/var_export.phpt
diff -u php-src/ext/standard/tests/general_functions/var_export.phpt:1.3
php-src/ext/standard/tests/general_functions/var_export.phpt:1.4
--- php-src/ext/standard/tests/general_functions/var_export.phpt:1.3 Tue May
29 10:25:21 2007
+++ php-src/ext/standard/tests/general_functions/var_export.phpt Sun Dec
9 16:54:30 2007
@@ -124,7 +124,8 @@
"\0",
'\0',
'\060',
- "\070"
+ "\070",
+ "\0hello\0this is an test, to work with ' and \0 and \n and
foreign chars too: blåbærøl"
);
$counter = 1;
/* Loop to check for above strings with var_export() */
@@ -568,9 +569,9 @@
Iteration 12
-'\000'
-'\000'
-string(6) "'\000'"
+'' . "\0" . ''
+'' . "\0" . ''
+string(14) "'' . "\0" . ''"
Iteration 13
@@ -590,6 +591,15 @@
'8'
string(3) "'8'"
+
+Iteration 16
+'' . "\0" . 'hello' . "\0" . 'this is an test, to work with \' and ' . "\0" .
' and
+ and foreign chars too: blåbærøl'
+'' . "\0" . 'hello' . "\0" . 'this is an test, to work with \' and ' . "\0" .
' and
+ and foreign chars too: blåbærøl'
+string(121) "'' . "\0" . 'hello' . "\0" . 'this is an test, to work with \'
and ' . "\0" . ' and
+ and foreign chars too: blåbærøl'"
+
*** Testing var_export() with valid arrays ***
*** Output for arrays ***
@@ -1320,9 +1330,9 @@
Iteration 12
-'\000'
-'\000'
-string(6) "'\000'"
+'' . "\0" . ''
+'' . "\0" . ''
+string(14) "'' . "\0" . ''"
Iteration 13
@@ -1342,6 +1352,15 @@
'8'
string(3) "'8'"
+
+Iteration 16
+'' . "\0" . 'hello' . "\0" . 'this is an test, to work with \' and ' . "\0" .
' and
+ and foreign chars too: bl' . "\u00E5" . 'b' . "\u00E6" . 'r' . "\u00F8" . 'l'
+'' . "\0" . 'hello' . "\0" . 'this is an test, to work with \' and ' . "\0" .
' and
+ and foreign chars too: bl' . "\u00E5" . 'b' . "\u00E6" . 'r' . "\u00F8" . 'l'
+string(163) "'' . "\0" . 'hello' . "\0" . 'this is an test, to work with \'
and ' . "\0" . ' and
+ and foreign chars too: bl' . "\u00E5" . 'b' . "\u00E6" . 'r' . "\u00F8" . 'l'"
+
*** Testing var_export() with valid arrays ***
*** Output for arrays ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug37262.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/bug37262.phpt
diff -u php-src/ext/standard/tests/strings/bug37262.phpt:1.2
php-src/ext/standard/tests/strings/bug37262.phpt:1.3
--- php-src/ext/standard/tests/strings/bug37262.phpt:1.2 Mon Oct 9
18:09:42 2006
+++ php-src/ext/standard/tests/strings/bug37262.phpt Sun Dec 9 16:54:30 2007
@@ -6,4 +6,4 @@
var_export($func);
?>
--EXPECT--
-'\000lambda_1'
+'' . "\0" . 'lambda_1'
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug42272.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/general_functions/bug42272.phpt
+++ php-src/ext/standard/tests/general_functions/bug42272.phpt
--TEST--
Bug #42272: var_export() incorrectly escapes char(0).
--FILE--
<?php
$foo = var_export("\0", true );
echo $foo, "\n";
var_export("a\0b");
?>
--EXPECT--
'' . "\0" . ''
'a' . "\0" . 'b'
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
