cvs: php4(PHP_4_3) /ext/standard file.c

From: Date: Mon, 28 Apr 2003 15:11:14 +0000
Subject: cvs: php4(PHP_4_3) /ext/standard file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-20537@lists.php.net to get a copy of this message
moriyoshi Mon Apr 28 11:11:14 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard file.c Log: MFH(r-1.336): added missing sanity check in fgetcsv() Partly synchronised indents with HEAD # please merge CS fixes to branches too, or leave them as is :( Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.279.2.17 php4/ext/standard/file.c:1.279.2.18 --- php4/ext/standard/file.c:1.279.2.17 Sat Apr 26 17:34:47 2003 +++ php4/ext/standard/file.c Mon Apr 28 11:11:14 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.279.2.17 2003/04/26 21:34:47 wez Exp $ */ +/* $Id: file.c,v 1.279.2.18 2003/04/28 15:11:14 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2121,49 +2121,50 @@ php_stream *stream; switch(ZEND_NUM_ARGS()) { - case 2: - if (zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) { - WRONG_PARAM_COUNT; - } - break; + case 2: + if (zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) { + WRONG_PARAM_COUNT; + } + break; - case 3: - 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 3: + if (zend_get_parameters_ex(3, &fd, &bytes, &p_delim) == FAILURE) { + WRONG_PARAM_COUNT; + } + break; - case 4: - if (zend_get_parameters_ex(4, &fd, &bytes, &p_delim, &p_enclosure) == FAILURE) { + case 4: + if (zend_get_parameters_ex(4, &fd, &bytes, &p_delim, &p_enclosure) == FAILURE) { + WRONG_PARAM_COUNT; + } + 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, "Third parameter must be a character"); - return; + 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]; - - break; - - default: - WRONG_PARAM_COUNT; - /* NOTREACHED */ - break; } php_stream_from_zval(stream, fd);

« previous php.cvs (#20537) next »