com php-src: Made Phar throw exception on bad constructor.: ext/phar/phar_object.c

From: Date: Sun, 15 Mar 2015 14:47:07 +0000
Subject: com php-src: Made Phar throw exception on bad constructor.: ext/phar/phar_object.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86004@lists.php.net to get a copy of this message
Commit: 0922eca0c7fd6864b4b631a48ff366ed10bc24ca Author: Danack <Danack@basereality.com> Sun, 15 Mar 2015 14:47:07 +0000 Parents: 99dae96dc0041f856ae066b3f572495da609d28e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0922eca0c7fd6864b4b631a48ff366ed10bc24ca Log: Made Phar throw exception on bad constructor. Changed paths: M ext/phar/phar_object.c Diff: diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 0b173d1...7976816 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object..c @@ -1120,17 +1120,26 @@ PHP_METHOD(Phar, __construct) phar_archive_object *phar_obj; phar_archive_data *phar_data; zval *zobj = getThis(), arg1, arg2; + zend_error_handling zeh; + int rv; phar_obj = (phar_archive_object*)((char*)Z_OBJ_P(zobj) - Z_OBJ_P(zobj)->handlers->offset); is_data = instanceof_function(Z_OBJCE_P(zobj), phar_ce_data); if (is_data) { - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ls!l", &fname, &fname_len, &flags, &alias, &alias_len, &format) == FAILURE) { + zend_replace_error_handling(EH_THROW, phar_ce_PharException, &zeh TSRMLS_CC); + rv = zend_parse_parameters(ZEND_NUM_ARGS(), "s|ls!l", &fname, &fname_len, &flags, &alias, &alias_len, &format); + zend_restore_error_handling(&zeh TSRMLS_CC); + if (rv == FAILURE) { return; } } else { - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ls!", &fname, &fname_len, &flags, &alias, &alias_len) == FAILURE) { + zend_replace_error_handling(EH_THROW, phar_ce_PharException, &zeh TSRMLS_CC); + rv = zend_parse_parameters(ZEND_NUM_ARGS(), "s|ls!", &fname, &fname_len, &flags, &alias, &alias_len); + zend_restore_error_handling(&zeh TSRMLS_CC); + if (rv == FAILURE) { + //Exception was thrown already return; } } @@ -4343,8 +4352,14 @@ PHP_METHOD(PharFileInfo, __construct) phar_entry_info *entry_info; phar_archive_data *phar_data; zval *zobj = getThis(), arg1; + zend_error_handling zeh; + int rv; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &fname, &fname_len) == FAILURE) { + zend_replace_error_handling(EH_THROW, phar_ce_PharException, &zeh TSRMLS_CC); + rv = zend_parse_parameters(ZEND_NUM_ARGS(), "s", &fname, &fname_len); + zend_restore_error_handling(&zeh TSRMLS_CC); + + if (rv == FAILURE) { return; }

« previous php.cvs (#86004) next »