cvs: php4 /ext/standard file.c

From: Date: Mon, 28 Apr 2003 15:04:56 +0000
Subject: cvs: php4 /ext/standard file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-20536@lists.php.net to get a copy of this message
moriyoshi Mon Apr 28 11:04:56 2003 EDT Modified files: /php4/ext/standard file.c Log: Added missing sanity check in fgetcsv() Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.335 php4/ext/standard/file.c:1.336 --- php4/ext/standard/file.c:1.335 Thu Apr 10 22:55:00 2003 +++ php4/ext/standard/file.c Mon Apr 28 11:04:56 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.335 2003/04/11 02:55:00 pollita Exp $ */ +/* $Id: file.c,v 1.336 2003/04/28 15:04:56 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1665,38 +1665,40 @@ if (zend_get_parameters_ex(3, &fd, &bytes, &p_delim) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(p_delim); - /* Make sure that there is at least one character in string */ - if (Z_STRLEN_PP(p_delim) < 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Third parameter must be a character"); - return; - } - /* use first character from string */ - delimiter = Z_STRVAL_PP(p_delim)[0]; break; case 4: if (zend_get_parameters_ex(4, &fd, &bytes, &p_delim, &p_enclosure) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_string_ex(p_delim); - /* Make sure that there is at least one character in string */ - if (Z_STRLEN_PP(p_delim) < 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Third parameter must be a character"); - return; - } - /* use first character from string */ - delimiter = Z_STRVAL_PP(p_delim)[0]; - - convert_to_string_ex(p_enclosure); - /* use first character from string */ - enclosure = Z_STRVAL_PP(p_enclosure)[0]; break; default: WRONG_PARAM_COUNT; /* NOTREACHED */ break; + } + + if (ZEND_NUM_ARGS() >= 3) { + convert_to_string_ex(p_delim); + /* Make sure that there is at least one character in string */ + if (Z_STRLEN_PP(p_delim) < 1) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "delimiter must be a character"); + RETURN_FALSE; + } + /* use first character from string */ + delimiter = Z_STRVAL_PP(p_delim)[0]; + } + + if (ZEND_NUM_ARGS() >= 4) { + convert_to_string_ex(p_enclosure); + /* Make sure that there is at least one character in string */ + if (Z_STRLEN_PP(p_enclosure) < 1) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "enclosure must be a character"); + RETURN_FALSE; + } + /* use first character from string */ + enclosure = Z_STRVAL_PP(p_enclosure)[0]; } php_stream_from_zval(stream, fd);

« previous php.cvs (#20536) next »