From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 2 Apr 2004 16:54:44 +0000 (+0000)
Subject: Fixed bug #27730.
X-Git-Tag: php-4.3.6RC2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85923625feac8b6b4e8e0d9d3a5993f8569be877;p=php

Fixed bug #27730.
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 779cad2517..3741bb6bbf 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2331,6 +2331,11 @@ PHP_FUNCTION(fgetcsv)
 	}	\
 }
 
+	if (!(e - s)) {
+		CSV_ADD_ENTRY(s, e, s);
+		goto done;
+	}
+
 csv_start:
 	if (!enclosure || !(p = _php_fgetcsv_find_enclosure(s, (e - s), enclosure, 0))) {
 no_enclosure:
diff --git a/ext/standard/tests/file/fgetcsv.phpt b/ext/standard/tests/file/fgetcsv.phpt
index a247c5f73a..3777290009 100644
--- a/ext/standard/tests/file/fgetcsv.phpt
+++ b/ext/standard/tests/file/fgetcsv.phpt
@@ -23,7 +23,8 @@ various fgetcsv() functionality tests
 		'aaa"aaa","bbb"bbb',
 		'aaa"aaa""",bbb',
 		'aaa"\\"a","bbb"',
-		'""'
+		'""',
+		''
 	);
 
 	$file = dirname(__FILE__) . 'fgetcsv.csv';
@@ -161,3 +162,7 @@ array(1) {
   [0]=>
   string(0) ""
 }
+array(1) {
+  [0]=>
+  string(0) ""
+}