diff options
author | SVN Migration <svn@php.net> | 2002-09-08 15:38:45 +0000 |
---|---|---|
committer | SVN Migration <svn@php.net> | 2002-09-08 15:38:45 +0000 |
commit | e94c67742f6f4bf9fe9a381273d1ea6a16db5ec3 (patch) | |
tree | 7cb16c2c460931bbf4798a79167770dfb48ff643 /ext/standard/file.c | |
parent | 6c22f90b4a3d24a8da83e78f8eef97cba6c05197 (diff) | |
download | php-git-php-4.3.0dev_zend2_alpha3.tar.gz |
This commit was manufactured by cvs2svn to create tagphp-4.3.0dev_zend2_alpha3
'php_4_3_0_dev_zend2_alpha3'.
Diffstat (limited to 'ext/standard/file.c')
-rw-r--r-- | ext/standard/file.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 80de164ab8..15c2e902c4 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1991,8 +1991,14 @@ PHP_FUNCTION(fgetcsv) while(isspace((int) *bptr) && (*bptr!=delimiter)) bptr++; /* 2. Read field, leaving bptr pointing at start of next field */ if (enclosure && *bptr == enclosure) { + bptr++; /* move on to first character in field */ + + /* Check if there is an end to the enclosure */ + if (!strchr(bptr, enclosure)) { + continue; + } + /* 2A. handle enclosure delimited field */ - bptr++; /* move on to first character in field */ while (*bptr) { if (*bptr == enclosure) { /* handle the enclosure */ |