iliaa Thu Jan 29 09:35:35 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/file fgetcsv.phpt
/php-src/ext/standard file.c
Log:
Fix for a possible crash in fgetcsv(). (Patch by Moriyoshi Koizumi)
http://cvs.php.net/diff.php/php-src/ext/standard/tests/file/fgetcsv.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/standard/tests/file/fgetcsv.phpt
diff -u php-src/ext/standard/tests/file/fgetcsv.phpt:1.1.2.1
php-src/ext/standard/tests/file/fgetcsv.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/fgetcsv.phpt:1.1.2.1 Sun Jan 18 22:55:44
2004
+++ php-src/ext/standard/tests/file/fgetcsv.phpt Thu Jan 29 09:35:34 2004
@@ -22,7 +22,8 @@
'aaa,"bbb "',
'aaa"aaa","bbb"bbb',
'aaa"aaa""",bbb',
- 'aaa"\\"a","bbb"'
+ 'aaa"\\"a","bbb"',
+ '""'
);
$file = dirname(__FILE__) . 'fgetcsv.csv';
@@ -156,3 +157,7 @@
[1]=>
string(3) "bbb"
}
+array(1) {
+ [0]=>
+ string(0) ""
+}
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.279.2.56&r2=1.279.2.57&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.56 php-src/ext/standard/file.c:1.279.2.57
--- php-src/ext/standard/file.c:1.279.2.56 Tue Jan 20 21:33:22 2004
+++ php-src/ext/standard/file.c Thu Jan 29 09:35:34 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.56 2004/01/21 02:33:22 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.57 2004/01/29 14:35:34 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2408,11 +2408,9 @@
e--;
}
- if (e - s) {
- buf2 = erealloc(buf2, buf2_len + (e - s) + 1);
- memcpy(buf2 + buf2_len, s, (e - s));
- buf2_len += e - s;
- }
+ buf2 = erealloc(buf2, buf2_len + (e - s) + 1);
+ memcpy(buf2 + buf2_len, s, (e - s));
+ buf2_len += e - s;
enclosure_done:
_php_fgetcsv_trim_enclosed(buf2, &buf2_len, enclosure);
CSV_ADD_ENTRY(buf2, buf2_len, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
