From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 18 Jan 2005 00:14:56 +0000 (+0000)
Subject: Fixed bug #31580 (fgetcsv() problematic with "" escape sequences).
X-Git-Tag: php-4.3.11RC1~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6029240086d67de00cd96fa65db491d74ccb7f90;p=php

Fixed bug #31580 (fgetcsv() problematic with "" escape sequences).
---

diff --git a/NEWS b/NEWS
index 38b9f20a61..ba27f69a81 100644
--- 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).
diff --git a/ext/standard/file.c b/ext/standard/file.c
index b0bae7c1d1..b1ad6f742d 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -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);