]> granicus.if.org Git - apache/commitdiff
Follow up to r1755264.
authorYann Ylavic <ylavic@apache.org>
Fri, 5 Aug 2016 15:08:24 +0000 (15:08 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 5 Aug 2016 15:08:24 +0000 (15:08 +0000)
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

server/protocol.c

index b77d78b3e8d1f1ab563eb470cebc1911fe22c19b..87357ab5587ee565b242130f342844c742f5ab61 100644 (file)
@@ -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;
         }