From: Joe Orton <jorton@apache.org>
Date: Tue, 12 Oct 2021 08:27:15 +0000 (+0000)
Subject: * modules/filters/mod_deflate.c (deflate_out_filter): Catch
X-Git-Tag: 2.5.0-alpha2-ci-test-only~755
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a2dfc9084eeebe3e32b010f0aa92197d07c448;p=thirdparty%2Fapache%2Fhttpd.git

* modules/filters/mod_deflate.c (deflate_out_filter): Catch
  apr_bucket_read() errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894152 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index c62bdf7d0a6..ab8b1aa28ca 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-10298
+10299
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 102d54f5834..beff3b81af2 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -989,7 +989,12 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
         }
 
         /* read */
-        apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
+        rv = apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
+        if (rv) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10298)
+                          "failed reading from %s bucket", e->type->name);
+            return rv;
+        }
         if (!len) {
             apr_bucket_delete(e);
             continue;