Fixed bug #29719 (fgetcsv() has problem parsing strings ending with escaped

enclosures).

diff --git a/NEWS b/NEWS
index b812fd21cbf8005c0152feb377add8ae6f611129..749a1efe0fce7b832fc44ca77e818c9465d11d16 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, Version 4.3.9
 - Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
+- Fixed bug #29719 (fgetcsv() has problem parsing strings ending with escaped
+  enclosures). (Ilia)
 - Fixed bug #29599 (domxml_error segfaults another apache module). (Rob)
 - Fixed bug #29594 (Use PHP's own tmpfile() implementation). (Ilia)
 

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 6b2aa26f7ebb375ae70b4af75a804022ee4ab449..f798105e889b7ebc61294d8621bd6ba110befda1 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2410,10 +2410,6 @@ enclosure:
                                goto enclosure;
                        }
                } else {
-                       while (e < re && e > s && *(e - 1) == enclosure) {
-                               e--;
-                       }
-
                        buf2 = erealloc(buf2, buf2_len + (e - s) + 1);
                        memcpy(buf2 + buf2_len, s, (e - s));
                        buf2_len += e - s;