Skip to content

Commit ea91c08

Browse files
devnexennikic
authored andcommitted
Drop unnecessary checks of pemalloc() return value
1 parent e31342e commit ea91c08

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

ext/iconv/iconv.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2665,19 +2665,10 @@ static int php_iconv_stream_filter_append_bucket(
26652665
php_stream_bucket_append(buckets_out, new_bucket);
26662666

26672667
out_buf_size = ocnt = initial_out_buf_size;
2668-
if (NULL == (out_buf = pemalloc(out_buf_size, persistent))) {
2669-
return FAILURE;
2670-
}
2668+
out_buf = pemalloc(out_buf_size, persistent);
26712669
pd = out_buf;
26722670
} else {
2673-
if (NULL == (new_out_buf = perealloc(out_buf, new_out_buf_size, persistent))) {
2674-
if (NULL == (new_bucket = php_stream_bucket_new(stream, out_buf, (out_buf_size - ocnt), 1, persistent))) {
2675-
goto out_failure;
2676-
}
2677-
2678-
php_stream_bucket_append(buckets_out, new_bucket);
2679-
return FAILURE;
2680-
}
2671+
new_out_buf = perealloc(out_buf, new_out_buf_size, persistent);
26812672
pd = new_out_buf + (pd - out_buf);
26822673
ocnt += (new_out_buf_size - out_buf_size);
26832674
out_buf = new_out_buf;

ext/standard/filters.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,20 +1540,10 @@ static int strfilter_convert_append_bucket(
15401540
php_stream_bucket_append(buckets_out, new_bucket);
15411541

15421542
out_buf_size = ocnt = initial_out_buf_size;
1543-
if (NULL == (out_buf = pemalloc(out_buf_size, persistent))) {
1544-
return FAILURE;
1545-
}
1543+
out_buf = pemalloc(out_buf_size, persistent);
15461544
pd = out_buf;
15471545
} else {
1548-
if (NULL == (new_out_buf = perealloc(out_buf, new_out_buf_size, persistent))) {
1549-
if (NULL == (new_bucket = php_stream_bucket_new(stream, out_buf, (out_buf_size - ocnt), 1, persistent))) {
1550-
goto out_failure;
1551-
}
1552-
1553-
php_stream_bucket_append(buckets_out, new_bucket);
1554-
return FAILURE;
1555-
}
1556-
1546+
new_out_buf = perealloc(out_buf, new_out_buf_size, persistent);
15571547
pd = new_out_buf + (pd - out_buf);
15581548
ocnt += (new_out_buf_size - out_buf_size);
15591549
out_buf = new_out_buf;

0 commit comments

Comments
 (0)