diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-03 19:16:51 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-03 19:20:56 +0100 |
| commit | bbcfa66e06110d8256595e644378a5358dda3558 (patch) | |
| tree | 7f10e2a82a2a6804dfb0bbd0438398175e5421d0 /ext/curl/multi.c | |
| parent | e08ce4c13db6e9aecd3497cd270b72d06c649bc7 (diff) | |
| download | php-git-bbcfa66e06110d8256595e644378a5358dda3558.tar.gz | |
Use RETURN_THROWS() after zend_fetch_resource*()
Diffstat (limited to 'ext/curl/multi.c')
| -rw-r--r-- | ext/curl/multi.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index 45995f6ac8..4dbd9ff5a5 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -81,11 +81,11 @@ PHP_FUNCTION(curl_multi_add_handle) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) { - return; + RETURN_THROWS(); } _php_curl_cleanup_handle(ch); @@ -167,11 +167,11 @@ PHP_FUNCTION(curl_multi_remove_handle) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) { - return; + RETURN_THROWS(); } error = curl_multi_remove_handle(mh->multi, ch->cp); @@ -220,7 +220,7 @@ PHP_FUNCTION(curl_multi_select) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } #if LIBCURL_VERSION_NUM >= 0x071c00 /* Available since 7.28.0 */ @@ -265,7 +265,7 @@ PHP_FUNCTION(curl_multi_exec) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } { @@ -277,7 +277,7 @@ PHP_FUNCTION(curl_multi_exec) pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) { if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(pz_ch), le_curl_name, le_curl)) == NULL) { - return; + RETURN_THROWS(); } _php_curl_verify_handlers(ch, 1); @@ -305,7 +305,7 @@ PHP_FUNCTION(curl_multi_getcontent) ZEND_PARSE_PARAMETERS_END(); if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) { - return; + RETURN_THROWS(); } if (ch->handlers->write->method == PHP_CURL_RETURN) { @@ -338,7 +338,7 @@ PHP_FUNCTION(curl_multi_info_read) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } tmp_msg = curl_multi_info_read(mh->multi, &queued_msgs); @@ -392,7 +392,7 @@ PHP_FUNCTION(curl_multi_close) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } zend_list_close(Z_RES_P(z_mh)); @@ -444,7 +444,7 @@ PHP_FUNCTION(curl_multi_errno) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } RETURN_LONG(mh->err.no); @@ -623,7 +623,7 @@ PHP_FUNCTION(curl_multi_setopt) ZEND_PARSE_PARAMETERS_END(); if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) { - return; + RETURN_THROWS(); } if (!_php_curl_multi_setopt(mh, options, zvalue, return_value)) { |