Skip to content

Commit bbcfa66

Browse files
kocsismatekocsismate
committed
Use RETURN_THROWS() after zend_fetch_resource*()
1 parent e08ce4c commit bbcfa66

File tree

25 files changed

+338
-338
lines changed

25 files changed

+338
-338
lines changed

‎ext/curl/interface.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,7 +1959,7 @@ PHP_FUNCTION(curl_copy_handle)
19591959
ZEND_PARSE_PARAMETERS_END();
19601960

19611961
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
1962-
return;
1962+
RETURN_THROWS();
19631963
}
19641964

19651965
cp = curl_easy_duphandle(ch->cp);
@@ -2927,7 +2927,7 @@ PHP_FUNCTION(curl_setopt)
29272927
ZEND_PARSE_PARAMETERS_END();
29282928

29292929
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
2930-
return;
2930+
RETURN_THROWS();
29312931
}
29322932

29332933
if (options <= 0 && options != CURLOPT_SAFE_UPLOAD) {
@@ -2958,7 +2958,7 @@ PHP_FUNCTION(curl_setopt_array)
29582958
ZEND_PARSE_PARAMETERS_END();
29592959

29602960
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
2961-
return;
2961+
RETURN_THROWS();
29622962
}
29632963

29642964
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(arr), option, string_key, entry) {
@@ -3005,7 +3005,7 @@ PHP_FUNCTION(curl_exec)
30053005
ZEND_PARSE_PARAMETERS_END();
30063006

30073007
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3008-
return;
3008+
RETURN_THROWS();
30093009
}
30103010

30113011
_php_curl_verify_handlers(ch, 1);
@@ -3064,7 +3064,7 @@ PHP_FUNCTION(curl_getinfo)
30643064
ZEND_PARSE_PARAMETERS_END();
30653065

30663066
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3067-
return;
3067+
RETURN_THROWS();
30683068
}
30693069

30703070
if (ZEND_NUM_ARGS() < 2) {
@@ -3328,7 +3328,7 @@ PHP_FUNCTION(curl_error)
33283328
ZEND_PARSE_PARAMETERS_END();
33293329

33303330
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3331-
return;
3331+
RETURN_THROWS();
33323332
}
33333333

33343334
if (ch->err.no) {
@@ -3352,7 +3352,7 @@ PHP_FUNCTION(curl_errno)
33523352
ZEND_PARSE_PARAMETERS_END();
33533353

33543354
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3355-
return;
3355+
RETURN_THROWS();
33563356
}
33573357

33583358
RETURN_LONG(ch->err.no);
@@ -3371,7 +3371,7 @@ PHP_FUNCTION(curl_close)
33713371
ZEND_PARSE_PARAMETERS_END();
33723372

33733373
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3374-
return;
3374+
RETURN_THROWS();
33753375
}
33763376

33773377
if (ch->in_callback) {
@@ -3545,7 +3545,7 @@ PHP_FUNCTION(curl_reset)
35453545
ZEND_PARSE_PARAMETERS_END();
35463546

35473547
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3548-
return;
3548+
RETURN_THROWS();
35493549
}
35503550

35513551
if (ch->in_callback) {
@@ -3574,7 +3574,7 @@ PHP_FUNCTION(curl_escape)
35743574
ZEND_PARSE_PARAMETERS_END();
35753575

35763576
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3577-
return;
3577+
RETURN_THROWS();
35783578
}
35793579

35803580
if (ZEND_SIZE_T_INT_OVFL(ZSTR_LEN(str))) {
@@ -3606,7 +3606,7 @@ PHP_FUNCTION(curl_unescape)
36063606
ZEND_PARSE_PARAMETERS_END();
36073607

36083608
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3609-
return;
3609+
RETURN_THROWS();
36103610
}
36113611

36123612
if (ZEND_SIZE_T_INT_OVFL(ZSTR_LEN(str))) {
@@ -3637,7 +3637,7 @@ PHP_FUNCTION(curl_pause)
36373637
ZEND_PARSE_PARAMETERS_END();
36383638

36393639
if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
3640-
return;
3640+
RETURN_THROWS();
36413641
}
36423642

36433643
RETURN_LONG(curl_easy_pause(ch->cp, bitmask));

‎ext/curl/multi.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ PHP_FUNCTION(curl_multi_add_handle)
8181
ZEND_PARSE_PARAMETERS_END();
8282

8383
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
84-
return;
84+
RETURN_THROWS();
8585
}
8686

8787
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
88-
return;
88+
RETURN_THROWS();
8989
}
9090

9191
_php_curl_cleanup_handle(ch);
@@ -167,11 +167,11 @@ PHP_FUNCTION(curl_multi_remove_handle)
167167
ZEND_PARSE_PARAMETERS_END();
168168

169169
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
170-
return;
170+
RETURN_THROWS();
171171
}
172172

173173
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
174-
return;
174+
RETURN_THROWS();
175175
}
176176

177177
error = curl_multi_remove_handle(mh->multi, ch->cp);
@@ -220,7 +220,7 @@ PHP_FUNCTION(curl_multi_select)
220220
ZEND_PARSE_PARAMETERS_END();
221221

222222
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
223-
return;
223+
RETURN_THROWS();
224224
}
225225

226226
#if LIBCURL_VERSION_NUM >= 0x071c00 /* Available since 7.28.0 */
@@ -265,7 +265,7 @@ PHP_FUNCTION(curl_multi_exec)
265265
ZEND_PARSE_PARAMETERS_END();
266266

267267
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
268-
return;
268+
RETURN_THROWS();
269269
}
270270

271271
{
@@ -277,7 +277,7 @@ PHP_FUNCTION(curl_multi_exec)
277277
pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) {
278278

279279
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(pz_ch), le_curl_name, le_curl)) == NULL) {
280-
return;
280+
RETURN_THROWS();
281281
}
282282

283283
_php_curl_verify_handlers(ch, 1);
@@ -305,7 +305,7 @@ PHP_FUNCTION(curl_multi_getcontent)
305305
ZEND_PARSE_PARAMETERS_END();
306306

307307
if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
308-
return;
308+
RETURN_THROWS();
309309
}
310310

311311
if (ch->handlers->write->method == PHP_CURL_RETURN) {
@@ -338,7 +338,7 @@ PHP_FUNCTION(curl_multi_info_read)
338338
ZEND_PARSE_PARAMETERS_END();
339339

340340
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
341-
return;
341+
RETURN_THROWS();
342342
}
343343

344344
tmp_msg = curl_multi_info_read(mh->multi, &queued_msgs);
@@ -392,7 +392,7 @@ PHP_FUNCTION(curl_multi_close)
392392
ZEND_PARSE_PARAMETERS_END();
393393

394394
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
395-
return;
395+
RETURN_THROWS();
396396
}
397397

398398
zend_list_close(Z_RES_P(z_mh));
@@ -444,7 +444,7 @@ PHP_FUNCTION(curl_multi_errno)
444444
ZEND_PARSE_PARAMETERS_END();
445445

446446
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
447-
return;
447+
RETURN_THROWS();
448448
}
449449

450450
RETURN_LONG(mh->err.no);
@@ -623,7 +623,7 @@ PHP_FUNCTION(curl_multi_setopt)
623623
ZEND_PARSE_PARAMETERS_END();
624624

625625
if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
626-
return;
626+
RETURN_THROWS();
627627
}
628628

629629
if (!_php_curl_multi_setopt(mh, options, zvalue, return_value)) {

‎ext/curl/share.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ PHP_FUNCTION(curl_share_close)
5858
ZEND_PARSE_PARAMETERS_END();
5959

6060
if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(z_sh), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
61-
return;
61+
RETURN_THROWS();
6262
}
6363

6464
zend_list_close(Z_RES_P(z_sh));
@@ -102,7 +102,7 @@ PHP_FUNCTION(curl_share_setopt)
102102
ZEND_PARSE_PARAMETERS_END();
103103

104104
if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(zid), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
105-
return;
105+
RETURN_THROWS();
106106
}
107107

108108
if (!_php_curl_share_setopt(sh, options, zvalue, return_value)) {
@@ -136,7 +136,7 @@ PHP_FUNCTION(curl_share_errno)
136136
ZEND_PARSE_PARAMETERS_END();
137137

138138
if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(z_sh), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
139-
return;
139+
RETURN_THROWS();
140140
}
141141

142142
RETURN_LONG(sh->err.no);

‎ext/dba/dba.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free)
200200

201201
#define DBA_FETCH_RESOURCE(info, id) \
202202
if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \
203-
return; \
203+
RETURN_THROWS(); \
204204
}
205205

206206
#define DBA_FETCH_RESOURCE_WITH_ID(info, id) \
207207
if ((info = (dba_info *)zend_fetch_resource2(Z_RES_P(id), "DBA identifier", le_db, le_pdb)) == NULL) { \
208208
DBA_ID_DONE; \
209-
return; \
209+
RETURN_THROWS(); \
210210
}
211211

212212
#define DBA_ID_GET2 DBA_ID_PARS; DBA_GET2; DBA_FETCH_RESOURCE_WITH_ID(info, id)

‎ext/fileinfo/fileinfo.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ PHP_FUNCTION(finfo_close)
334334
}
335335

336336
if ((finfo = (php_fileinfo *)zend_fetch_resource(Z_RES_P(zfinfo), "file_info", le_fileinfo)) == NULL) {
337-
return;
337+
RETURN_THROWS();
338338
}
339339

340340
zend_list_close(Z_RES_P(zfinfo));
@@ -362,7 +362,7 @@ PHP_FUNCTION(finfo_set_flags)
362362
RETURN_THROWS();
363363
}
364364
if ((finfo = (php_fileinfo *)zend_fetch_resource(Z_RES_P(zfinfo), "file_info", le_fileinfo)) == NULL) {
365-
return;
365+
RETURN_THROWS();
366366
}
367367
}
368368

@@ -429,7 +429,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
429429
RETURN_THROWS();
430430
}
431431
if ((finfo = (php_fileinfo *)zend_fetch_resource(Z_RES_P(zfinfo), "file_info", le_fileinfo)) == NULL) {
432-
return;
432+
RETURN_THROWS();
433433
}
434434
magic = finfo->magic;
435435
}

0 commit comments

Comments
 (0)