]> granicus.if.org Git - php/commitdiff
Fixed bug #31580 (fgetcsv() problematic with "" escape sequences).
authorIlia Alshanetsky <iliaa@php.net>
Tue, 18 Jan 2005 00:14:56 +0000 (00:14 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Tue, 18 Jan 2005 00:14:56 +0000 (00:14 +0000)
NEWS
ext/standard/file.c

diff --git a/NEWS b/NEWS
index 38b9f20a61c3d99447674519fd1a2f04b4c14861..ba27f69a818163ac7e0442b7a36dc1af8e3e88a1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 4                                                                      NEWS
 ?? ??? ????, Version 4.3.11
 - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
+- Fixed bug #31580 (fgetcsv() problematic with "" escape sequences). (Ilia)
 - Fixed bug #31454 (session_set_save_handler crashes PHP when supplied
   non-existent object ref). (Tony)
 - Fixed bug #31444 (Memory leak in zend_language_scanner.c).
index b0bae7c1d115502b092c8c68cf9819d63bcb88cc..b1ad6f742da82fce0664fa8579cf65b0bb994068 100644 (file)
@@ -2427,9 +2427,6 @@ enclosure:
                if ((p = memchr(p2, delimiter, (e - p2)))) {
                        p2 = s;
                        s = p + 1;
-                       if (*p2 == enclosure) {
-                               p2++;
-                       }
 
                        /* copy data to buffer */
                        buf2 = erealloc(buf2, buf2_len + (p - p2) + 1);