From: Etienne Kneuss <colder@php.net>
Date: Sat, 20 Dec 2008 00:51:00 +0000 (+0000)
Subject: Fix #46636 (segfault in SplFileinfo::fgetcsv())
X-Git-Tag: php-5.4.0alpha1~191^2~4774
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b884dddbbf2e4a1e01aae8290fcfd042410fc231;p=php

Fix #46636 (segfault in SplFileinfo::fgetcsv())
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index abbed9db3d..2d28e18dc5 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2265,7 +2265,7 @@ cleanup:
 
 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;