diff options
| -rw-r--r-- | ext/iconv/iconv.c | 13 | ||||
| -rw-r--r-- | ext/standard/filters.c | 14 |
2 files changed, 4 insertions, 23 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index aaecd5e342..3bb7c81ea1 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -2665,19 +2665,10 @@ static int php_iconv_stream_filter_append_bucket( php_stream_bucket_append(buckets_out, new_bucket); out_buf_size = ocnt = initial_out_buf_size; - if (NULL == (out_buf = pemalloc(out_buf_size, persistent))) { - return FAILURE; - } + out_buf = pemalloc(out_buf_size, persistent); pd = out_buf; } else { - if (NULL == (new_out_buf = perealloc(out_buf, new_out_buf_size, persistent))) { - if (NULL == (new_bucket = php_stream_bucket_new(stream, out_buf, (out_buf_size - ocnt), 1, persistent))) { - goto out_failure; - } - - php_stream_bucket_append(buckets_out, new_bucket); - return FAILURE; - } + new_out_buf = perealloc(out_buf, new_out_buf_size, persistent); pd = new_out_buf + (pd - out_buf); ocnt += (new_out_buf_size - out_buf_size); out_buf = new_out_buf; diff --git a/ext/standard/filters.c b/ext/standard/filters.c index 261684a613..3a3cd8f80b 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -1540,20 +1540,10 @@ static int strfilter_convert_append_bucket( php_stream_bucket_append(buckets_out, new_bucket); out_buf_size = ocnt = initial_out_buf_size; - if (NULL == (out_buf = pemalloc(out_buf_size, persistent))) { - return FAILURE; - } + out_buf = pemalloc(out_buf_size, persistent); pd = out_buf; } else { - if (NULL == (new_out_buf = perealloc(out_buf, new_out_buf_size, persistent))) { - if (NULL == (new_bucket = php_stream_bucket_new(stream, out_buf, (out_buf_size - ocnt), 1, persistent))) { - goto out_failure; - } - - php_stream_bucket_append(buckets_out, new_bucket); - return FAILURE; - } - + new_out_buf = perealloc(out_buf, new_out_buf_size, persistent); pd = new_out_buf + (pd - out_buf); ocnt += (new_out_buf_size - out_buf_size); out_buf = new_out_buf; |