- Add slashes around string output

diff --git a/ext/standard/var.c b/ext/standard/var.c
index a1e924c4978063b626da62fd023e4f051afd3e83..d63ea712ce0e6e36fb00b7fdc055e7a6e18e1d99 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -256,6 +256,8 @@ static int php_array_element_export(zval **zv, int num_args, va_list args, zend_
 void php_var_export(zval **struc, int level TSRMLS_DC)
 {
        HashTable *myht;
+       char*     tmp_str;
+       int       tmp_len;
 
        switch (Z_TYPE_PP(struc)) {
        case IS_BOOL:
@@ -271,9 +273,11 @@ void php_var_export(zval **struc, int level TSRMLS_DC)
                php_printf("%.*G", (int) EG(precision), Z_DVAL_PP(struc));
                break;
        case IS_STRING:
+               tmp_str = php_addslashes(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &tmp_len, 0 TSRMLS_CC);
                PUTS ("'");
-               PHPWRITE(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc));
+               PHPWRITE(tmp_str, tmp_len);
                PUTS ("'");
+               efree (tmp_str);
                break;
        case IS_ARRAY:
                myht = Z_ARRVAL_PP(struc);