cvs: php-src /ext/standard file.c

From: Date: Sat, 20 Dec 2008 00:51:00 +0000
Subject: cvs: php-src /ext/standard file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-55030@lists.php.net to get a copy of this message
colder Sat Dec 20 00:51:00 2008 UTC Modified files: /php-src/ext/standard file.c Log: Fix #46636 (segfault in SplFileinfo::fgetcsv()) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.533&r2=1.534&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.533 php-src/ext/standard/file.c:1.534 --- php-src/ext/standard/file.c:1.533 Fri Dec 12 12:40:58 2008 +++ php-src/ext/standard/file.c Sat Dec 20 00:51:00 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.533 2008/12/12 12:40:58 bjori Exp $ */ +/* $Id: file.c,v 1.534 2008/12/20 00:51:00 colder Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2265,7 +2265,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char escape, size_t buf_len, char *buf, zval *return_value TSRMLS_DC) /* {{{ */ { - char *delim = &delimiter, *enc = &enclosure, *buffer = buf, *esc; + char *delim = &delimiter, *enc = &enclosure, *buffer = buf, *esc = &escape; int delim_len = 1, enc_len = 1, esc_len = 1, buffer_len = buf_len; zend_uchar type = IS_STRING;

« previous php.cvs (#55030) next »