com php-src: Removed invalid efree() (arguments are allocated on VM stack and used without copying): ext/interbase/ibase_events.c

From: Date: Wed, 16 Dec 2015 12:25:49 +0000
Subject: com php-src: Removed invalid efree() (arguments are allocated on VM stack and used without copying): ext/interbase/ibase_events.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90302@lists.php.net to get a copy of this message
Commit: c7c3b967a550b4f1137d6a7b2bf56ec1e4f6dbbd Author: Dmitry Stogov <dmitry@zend.com> Wed, 16 Dec 2015 15:25:49 +0300 Parents: 96fe1dfe535c76bf9e4fa93fdda0accae054f46f Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7c3b967a550b4f1137d6a7b2bf56ec1e4f6dbbd Log: Removed invalid efree() (arguments are allocated on VM stack and used without copying) Changed paths: M ext/interbase/ibase_events.c Diff: diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c index 6918886..26656f8 100644 --- a/ext/interbase/ibase_events.c +++ b/ext/interbase/ibase_events.c @@ -143,17 +143,14 @@ PHP_FUNCTION(ibase_wait_event) if (Z_TYPE(args[0]) == IS_RESOURCE) { if ((ib_link = (ibase_db_link *)zend_fetch_resource2_ex(&args[0], "InterBase link", le_link, le_plink)) == NULL) { - efree(args); RETURN_FALSE; } i = 1; } else { if (ZEND_NUM_ARGS() > 15) { - efree(args); WRONG_PARAM_COUNT; } if ((ib_link = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), "InterBase link", le_link, le_plink)) == NULL) { - efree(args); RETURN_FALSE; } } @@ -170,7 +167,6 @@ PHP_FUNCTION(ibase_wait_event) if (isc_wait_for_event(IB_STATUS, &ib_link->handle, buffer_size, event_buffer, result_buffer)) { _php_ibase_error(); _php_ibase_event_free(event_buffer,result_buffer); - efree(args); RETURN_FALSE; } @@ -180,7 +176,6 @@ PHP_FUNCTION(ibase_wait_event) if (occurred_event[i]) { zend_string *result = zend_string_init(events[i], strlen(events[i]), 0); _php_ibase_event_free(event_buffer,result_buffer); - efree(args); RETURN_STR(result); } } @@ -188,7 +183,6 @@ PHP_FUNCTION(ibase_wait_event) /* If we reach this line, isc_wait_for_event() did return, but we don't know which event fired. */ _php_ibase_event_free(event_buffer,result_buffer); - efree(args); RETURN_FALSE; } /* }}} */

« previous php.cvs (#90302) next »