[packages/php.git] / php-5.2.17-bug-55674.patch

diff -up php-5.2.17/ext/standard/file.c.bug-55674 php-5.2.17/ext/standard/file.c
--- php-5.2.17/ext/standard/file.c.bug-55674	2012-01-12 09:39:13.000000000 +0700
+++ php-5.2.17/ext/standard/file.c	2012-01-12 09:39:28.000000000 +0700
@@ -2156,7 +2156,7 @@ PHPAPI void php_fgetcsv(php_stream *stre
 		inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0);
 		if (inc_len == 1) {
 			char *tmp = bptr;
-			while (isspace((int)*(unsigned char *)tmp)) {
+			while ((*tmp != delimiter) && isspace((int)*(unsigned char *)tmp)) {
 				tmp++;
 			}
 			if (*tmp == enclosure) {
Commit	Line	Data
82f6b657 ER	1	diff -up php-5.2.17/ext/standard/file.c.bug-55674 php-5.2.17/ext/standard/file.c
	2	--- php-5.2.17/ext/standard/file.c.bug-55674 2012-01-12 09:39:13.000000000 +0700
	3	+++ php-5.2.17/ext/standard/file.c 2012-01-12 09:39:28.000000000 +0700
	4	@@ -2156,7 +2156,7 @@ PHPAPI void php_fgetcsv(php_stream *stre
	5	inc_len = (bptr < limit ? (*bptr == '\0' ? 1: php_mblen(bptr, limit - bptr)): 0);
	6	if (inc_len == 1) {
	7	char *tmp = bptr;
	8	- while (isspace((int)(unsigned char )tmp)) {
	9	+ while ((tmp != delimiter) && isspace((int)(unsigned char *)tmp)) {
	10	tmp++;
	11	}
	12	if (*tmp == enclosure) {