diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-01 16:42:30 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-01 16:42:30 +0100 |
| commit | 349a28646163b0e1433fad450edbac8215fc5b32 (patch) | |
| tree | 73d324c8aedc4c3ab41083ba6ede99b1d3c0936a /ext/mysqli/mysqli.c | |
| parent | 9099dbd9614b37b48818ac24e2020b0d756b7e1e (diff) | |
| download | php-git-349a28646163b0e1433fad450edbac8215fc5b32.tar.gz | |
Use RETURN_THROWS() after zend_throw_error()
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 4bb8ee76c1..a4baa58dcb 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1209,19 +1209,19 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags } if (UNEXPECTED(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) { zend_throw_error(NULL, "Class '%s' cannot be instantiated", ZSTR_VAL(ce->name)); - return; + RETURN_THROWS(); } fetchtype = MYSQLI_ASSOC; } else { if (override_flags) { if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) { - return; + RETURN_THROWS(); } fetchtype = override_flags; } else { fetchtype = MYSQLI_BOTH; if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &fetchtype) == FAILURE) { - return; + RETURN_THROWS(); } } } |