From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 5 Aug 2016 15:08:24 +0000 (+0000)
Subject: Follow up to r1755264.
X-Git-Tag: 2.5.0-alpha~1311
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e62f0351722b139bce189f8ffe9631b9dfe164d0;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1755264.
Don't crash when ap_rgetline() returns a NULL field on ENOSPC.


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

diff --git a/server/protocol.c b/server/protocol.c
index b77d78b3e8d..87357ab5587 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -814,8 +814,9 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb
                 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00561)
                               "Request header exceeds LimitRequestFieldSize%s"
                               "%.*s",
-                              *field ? ": " : "",
-                              field_name_len(field), field);
+                              (field && *field) ? ": " : "",
+                              (field) ? field_name_len(field) : 0,
+                              (field) ? field : "");
             }
             return;
         }