From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 15 May 2020 13:22:56 +0000 (+0000)
Subject: Follow up to r1877785: ap_filter_should_yield() is not NULL safe :p
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1434
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9c3ed38a2d8dcbe9a1a32d8aeebeb867f974039;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1877785: ap_filter_should_yield() is not NULL safe :p


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

diff --git a/server/util_filter.c b/server/util_filter.c
index a6ab80124c7..649615bf80a 100644
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -1276,7 +1276,7 @@ AP_DECLARE_NONSTD(int) ap_filter_output_pending(conn_rec *c)
             }
 
             if ((fp->bb && !APR_BRIGADE_EMPTY(fp->bb))
-                    || ap_filter_should_yield(f->next)) {
+                    || (f->next && ap_filter_should_yield(f->next))) {
                 rc = OK;
                 break;
             }