Revert "Update fputcsv() to escape all characters equally."

On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e8059b1e8bec096067491ed8d75f878938.

diff --git a/NEWS b/NEWS
index a7c2fa47e9c21602515024b562266e3d7e03ad2e..e78af2339d82cd3fcdcc45ad6e16b6e1ea42860d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,6 @@ PHP                                                                        NEWS
 - Core
   . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
     (Laruence)
-  . Fixed bug #43225 (fputcsv incorrectly handles cells ending in \ followed
-    by "). (Adam)
 
 - cURL extension:
   . Fixed bug (segfault due to libcurl connection caching). (Pierrick)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index fa85bf1b3a9235463742b03b02b8c77e56b5d974..8b18155cf89d8b8007081c01db1ee12e88e0dd39 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1953,6 +1953,7 @@ PHP_FUNCTION(fputcsv)
 {
        char delimiter = ',';   /* allow this to be set as parameter */
        char enclosure = '"';   /* allow this to be set as parameter */
+       const char escape_char = '\\';
        php_stream *stream;
        int ret;
        zval *fp = NULL, *fields = NULL, **field_tmp = NULL, field;
@@ -2007,19 +2008,24 @@ PHP_FUNCTION(fputcsv)
                /* enclose a field that contains a delimiter, an enclosure character, or a newline */
                if (FPUTCSV_FLD_CHK(delimiter) ||
                        FPUTCSV_FLD_CHK(enclosure) ||
+                       FPUTCSV_FLD_CHK(escape_char) ||
                        FPUTCSV_FLD_CHK('\n') ||
                        FPUTCSV_FLD_CHK('\r') ||
                        FPUTCSV_FLD_CHK('\t') ||
-                       FPUTCSV_FLD_CHK('\\') ||
                        FPUTCSV_FLD_CHK(' ')
                ) {
                        char *ch = Z_STRVAL(field);
                        char *end = ch + Z_STRLEN(field);
+                       int escaped = 0;
 
                        smart_str_appendc(&csvline, enclosure);
                        while (ch < end) {
-                               if (*ch == enclosure) {
+                               if (*ch == escape_char) {
+                                       escaped = 1;
+                               } else if (!escaped && *ch == enclosure) {
                                        smart_str_appendc(&csvline, enclosure);
+                               } else {
+                                       escaped = 0;
                                }
                                smart_str_appendc(&csvline, *ch);
                                ch++;

diff --git a/ext/standard/tests/file/fputcsv.phpt b/ext/standard/tests/file/fputcsv.phpt
index d71f777143c40624dd268818d2f4749dc94197d2..63c41509bdd90c4ab532ad99f162924b937ccf10 100644 (file)
--- a/ext/standard/tests/file/fputcsv.phpt
+++ b/ext/standard/tests/file/fputcsv.phpt
@@ -44,7 +44,7 @@ echo '$list = ';var_export($res);echo ";\n";
 
 $fp = fopen($file, "r");
 $res = array();
-while($l=fgetcsv($fp, 0, ',', '"', '"'))
+while($l=fgetcsv($fp))
 {
        $res[] = join(',',$l);
 }
@@ -75,10 +75,10 @@ $list = array (
   13 => 'aaa,"""bbb   """',
   14 => '"aaa""aaa""","""bbb""bbb"',
   15 => '"aaa""aaa""""""",bbb',
-  16 => 'aaa,"""\\""bbb",ccc',
-  17 => '"aaa""\\""a""","""bbb"""',
-  18 => '"""\\""""","""aaa"""',
-  19 => '"""\\""""""",aaa',
+  16 => 'aaa,"""\\"bbb",ccc',
+  17 => '"aaa""\\"a""","""bbb"""',
+  18 => '"""\\"""","""aaa"""',
+  19 => '"""\\"""""",aaa',
 );
 $list = array (
   0 => 'aaa,bbb',

diff --git a/ext/standard/tests/file/fputcsv_bug43225.phpt b/ext/standard/tests/file/fputcsv_bug43225.phpt
deleted file mode 100644 (file)
index 1de3b5f..0000000
--- a/ext/standard/tests/file/fputcsv_bug43225.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-fputcsv(): bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ")
---FILE--
-<?php
-
-$row = array(
-    'a\\"',
-    'bbb',
-);
-
-$file = dirname(__FILE__) . 'fgetcsv_bug43225.csv';
-$fp = fopen($file, 'w');
-fputcsv($fp, $row);
-fclose($fp);
-readfile($file);
-unlink($file);
-
-?>
---EXPECT--
-"a\""",bbb