Drop unnecessary checks of pemalloc() return value

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index aaecd5e342305ce79f46b9f2a1f4d5958e29e2b0..3bb7c81ea10424dd7894cab63ac736d40d1bceaa 100644 (file)
--- 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 261684a613fd41c5968d529533370427caf63d56..3a3cd8f80b6e34c654ae8168b982cc5515868775 100644 (file)
--- 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;