Skip to content

Commit 841f0b1

Browse files
authored
Remove dead error checks for php_stream_filter_alloc() (#19194)
php_stream_filter_alloc() can't fail, so simplify the code.
1 parent ba97d86 commit 841f0b1

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

ext/iconv/iconv.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,7 +2571,6 @@ static const php_stream_filter_ops php_iconv_stream_filter_ops = {
25712571
/* {{{ php_iconv_stream_filter_create */
25722572
static php_stream_filter *php_iconv_stream_filter_factory_create(const char *name, zval *params, uint8_t persistent)
25732573
{
2574-
php_stream_filter *retval = NULL;
25752574
php_iconv_stream_filter *inst;
25762575
const char *from_charset = NULL, *to_charset = NULL;
25772576
size_t from_charset_len, to_charset_len;
@@ -2602,12 +2601,7 @@ static php_stream_filter *php_iconv_stream_filter_factory_create(const char *nam
26022601
return NULL;
26032602
}
26042603

2605-
if (NULL == (retval = php_stream_filter_alloc(&php_iconv_stream_filter_ops, inst, persistent))) {
2606-
php_iconv_stream_filter_dtor(inst);
2607-
pefree(inst, persistent);
2608-
}
2609-
2610-
return retval;
2604+
return php_stream_filter_alloc(&php_iconv_stream_filter_ops, inst, persistent);
26112605
}
26122606
/* }}} */
26132607

ext/standard/filters.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,7 +1557,6 @@ static const php_stream_filter_ops strfilter_convert_ops = {
15571557
static php_stream_filter *strfilter_convert_create(const char *filtername, zval *filterparams, uint8_t persistent)
15581558
{
15591559
php_convert_filter *inst;
1560-
php_stream_filter *retval = NULL;
15611560

15621561
char *dot;
15631562
int conv_mode = 0;
@@ -1587,16 +1586,11 @@ static php_stream_filter *strfilter_convert_create(const char *filtername, zval
15871586
if (php_convert_filter_ctor(inst, conv_mode,
15881587
(filterparams != NULL ? Z_ARRVAL_P(filterparams) : NULL),
15891588
filtername, persistent) != SUCCESS) {
1590-
goto out;
1591-
}
1592-
1593-
retval = php_stream_filter_alloc(&strfilter_convert_ops, inst, persistent);
1594-
out:
1595-
if (retval == NULL) {
15961589
pefree(inst, persistent);
1590+
return NULL;
15971591
}
15981592

1599-
return retval;
1593+
return php_stream_filter_alloc(&strfilter_convert_ops, inst, persistent);
16001594
}
16011595

16021596
static const php_stream_filter_factory strfilter_convert_factory = {

ext/standard/user_filters.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,6 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
283283
}
284284

285285
filter = php_stream_filter_alloc(&userfilter_ops, NULL, 0);
286-
if (filter == NULL) {
287-
zval_ptr_dtor(&obj);
288-
return NULL;
289-
}
290286

291287
/* filtername */
292288
add_property_string(&obj, "filtername", (char*)filtername);

0 commit comments

Comments
 (0)