cvs: php-src(PHP_5_3) /ext/spl spl_fixedarray.c

felipe Sat May 23 15:14:15 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl_fixedarray.c Log: - MFH: Added missing param checks http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_fixedarray.c?r1=1.1.2.10&r2=1.1.2.11&diff_format=u Index: php-src/ext/spl/spl_fixedarray.c diff -u php-src/ext/spl/spl_fixedarray.c:1.1.2.10 php-src/ext/spl/spl_fixedarray.c:1.1.2.11 --- php-src/ext/spl/spl_fixedarray.c:1.1.2.10 Wed Dec 31 11:15:43 2008 +++ php-src/ext/spl/spl_fixedarray.c Sat May 23 15:14:15 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_fixedarray.c,v 1.1.2.10 2008/12/31 11:15:43 sebastian Exp $ */ +/* $Id: spl_fixedarray.c,v 1.1.2.11 2009/05/23 15:14:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -912,6 +912,10 @@ SPL_METHOD(SplFixedArray, key) { spl_fixedarray_object *intern = (spl_fixedarray_object*)zend_object_store_get_object(getThis() TSRMLS_CC); + + if (zend_parse_parameters_none() == FAILURE) { + return; + } RETURN_LONG(intern->current); } @@ -922,6 +926,10 @@ SPL_METHOD(SplFixedArray, next) { spl_fixedarray_object *intern = (spl_fixedarray_object*)zend_object_store_get_object(getThis() TSRMLS_CC); + + if (zend_parse_parameters_none() == FAILURE) { + return; + } intern->current++; } @@ -932,6 +940,10 @@ SPL_METHOD(SplFixedArray, valid) { spl_fixedarray_object *intern = (spl_fixedarray_object*)zend_object_store_get_object(getThis() TSRMLS_CC); + + if (zend_parse_parameters_none() == FAILURE) { + return; + } RETURN_BOOL(intern->current >= 0 && intern->array && intern->current < intern->array->size); } @@ -942,6 +954,10 @@ SPL_METHOD(SplFixedArray, rewind) { spl_fixedarray_object *intern = (spl_fixedarray_object*)zend_object_store_get_object(getThis() TSRMLS_CC); + + if (zend_parse_parameters_none() == FAILURE) { + return; + } intern->current = 0; } @@ -953,7 +969,10 @@ { zval *zindex, **value_pp; spl_fixedarray_object *intern = (spl_fixedarray_object*)zend_object_store_get_object(getThis() TSRMLS_CC); - + + if (zend_parse_parameters_none() == FAILURE) { + return; + } ALLOC_INIT_ZVAL(zindex); ZVAL_LONG(zindex, intern->current);