php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead error checks for php_stream_filter_alloc() (#19194)

Browse Source 
php_stream_filter_alloc() can't fail, so simplify the code.
This commit is contained in:
Niels Dossche
2025-08-12 22:18:39 +02:00
committed by GitHub
parent ba97d8636a
commit 841f0b1515
3 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/iconv/iconv.c
View File

@@ -2571,7 +2571,6 @@ static const php_stream_filter_ops php_iconv_stream_filter_ops = {
/* {{{ php_iconv_stream_filter_create */
static php_stream_filter *php_iconv_stream_filter_factory_create(const char *name, zval *params, uint8_t persistent)
{
php_stream_filter *retval = NULL;
php_iconv_stream_filter *inst;
const char *from_charset = NULL, *to_charset = NULL;
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
return NULL;
}
if (NULL == (retval = php_stream_filter_alloc(&php_iconv_stream_filter_ops, inst, persistent))) {
php_iconv_stream_filter_dtor(inst);
pefree(inst, persistent);
}
return retval;
return php_stream_filter_alloc(&php_iconv_stream_filter_ops, inst, persistent);
}
/* }}} */

10
ext/standard/filters.c
View File

@@ -1557,7 +1557,6 @@ static const php_stream_filter_ops strfilter_convert_ops = {
static php_stream_filter *strfilter_convert_create(const char *filtername, zval *filterparams, uint8_t persistent)
{
php_convert_filter *inst;
php_stream_filter *retval = NULL;
char *dot;
int conv_mode = 0;
@@ -1587,16 +1586,11 @@ static php_stream_filter *strfilter_convert_create(const char *filtername, zval
if (php_convert_filter_ctor(inst, conv_mode,
(filterparams != NULL ? Z_ARRVAL_P(filterparams) : NULL),
filtername, persistent) != SUCCESS) {
goto out;
}
retval = php_stream_filter_alloc(&strfilter_convert_ops, inst, persistent);
out:
if (retval == NULL) {
pefree(inst, persistent);
return NULL;
}
return retval;
return php_stream_filter_alloc(&strfilter_convert_ops, inst, persistent);
}
static const php_stream_filter_factory strfilter_convert_factory = {

4
ext/standard/user_filters.c
View File

@@ -283,10 +283,6 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
}
filter = php_stream_filter_alloc(&userfilter_ops, NULL, 0);
if (filter == NULL) {
zval_ptr_dtor(&obj);
return NULL;
}
/* filtername */
add_property_string(&obj, "filtername", (char*)filtername);