com php-src: Drop unnecessary checks of pemalloc() return value: ext/iconv/iconv.c ext/standard/filters.c
| From: | Nikita Popov | Date: | Sun, 12 Mar 2017 16:06:25 +0000 |
| Subject: | com php-src: Drop unnecessary checks of pemalloc() return value: ext/iconv/iconv.c ext/standard/filters.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97287@lists.php.net to get a copy of this message | ||
Commit: ea91c082328c6f93f20a078896c16c2051061f47
Author: David Carlier <devnexen@gmail.com> Sat, 11 Mar 2017 23:50:50 +0000
Committer: Nikita Popov <nikita.ppv@gmail.com> Sun, 12 Mar 2017 17:06:25 +0100
Parents: e31342ef843f98523722b2d37ea23190bf2781af
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ea91c082328c6f93f20a078896c16c2051061f47
Log:
Drop unnecessary checks of pemalloc() return value
Changed paths:
M ext/iconv/iconv.c
M ext/standard/filters.c
Diff:
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index aaecd5e..3bb7c81 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 261684a..3a3cd8f 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;