iliaa Tue Aug 17 10:10:04 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard file.c
Log:
Fixed bug #29719 (fgetcsv() has problem parsing strings ending with escaped
enclosures).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.717&r2=1.1247.2.718&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.717 php-src/NEWS:1.1247.2.718
--- php-src/NEWS:1.1247.2.717 Mon Aug 16 19:08:53 2004
+++ php-src/NEWS Tue Aug 17 10:10:03 2004
@@ -2,6 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 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)
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.279.2.60&r2=1.279.2.61&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.60 php-src/ext/standard/file.c:1.279.2.61
--- php-src/ext/standard/file.c:1.279.2.60 Fri May 14 12:12:06 2004
+++ php-src/ext/standard/file.c Tue Aug 17 10:10:03 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.60 2004/05/14 16:12:06 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.61 2004/08/17 14:10:03 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2410,10 +2410,6 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
