cvs: php-src /ext/pfpro pfpro.c

From: Date: Thu, 20 May 2004 00:11:12 +0000
Subject: cvs: php-src /ext/pfpro pfpro.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-27386@lists.php.net to get a copy of this message
iliaa Wed May 19 20:11:12 2004 EDT Modified files: /php-src/ext/pfpro pfpro.c Log: Free vars before calling E_ERROR. http://cvs.php.net/diff.php/php-src/ext/pfpro/pfpro.c?r1=1.32&r2=1.33&ty=u Index: php-src/ext/pfpro/pfpro.c diff -u php-src/ext/pfpro/pfpro.c:1.32 php-src/ext/pfpro/pfpro.c:1.33 --- php-src/ext/pfpro/pfpro.c:1.32 Thu Jan 8 03:17:03 2004 +++ php-src/ext/pfpro/pfpro.c Wed May 19 20:11:11 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pfpro.c,v 1.32 2004/01/08 08:17:03 andi Exp $ */ +/* $Id: pfpro.c,v 1.33 2004/05/20 00:11:11 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -328,14 +328,14 @@ args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0); if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) { + efree(args); php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to read parameters in pfpro_process()"); - efree(args); RETURN_FALSE; } if (Z_TYPE_PP(args[0]) != IS_ARRAY) { + efree(args); php_error_docref(NULL TSRMLS_CC, E_ERROR, "First parameter to pfpro_process() must be an array"); - efree(args); RETURN_FALSE; } @@ -418,11 +418,11 @@ break; default: - php_error_docref(NULL TSRMLS_CC, E_ERROR, "pfpro_process() array keys must be strings or integers"); if (parmlist) { efree(parmlist); } efree(args); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "pfpro_process() array keys must be strings or integers"); RETURN_FALSE; } @@ -464,11 +464,11 @@ break; default: - php_error_docref(NULL TSRMLS_CC, E_ERROR, "pfpro_process() array values must be strings, ints or floats"); if (parmlist) { efree(parmlist); } efree(args); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "pfpro_process() array values must be strings, ints or floats"); RETURN_FALSE; } zend_hash_move_forward(target_hash);

« previous php.cvs (#27386) next »