[src/trunk]: src/libexec/httpd Account for cgihandler being set when counting...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6d738070d9d
branches:  trunk
changeset: 997860:d6d738070d9d
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Mar 29 14:46:44 2019 +0000

description:
Account for cgihandler being set when counting the number of CGI environment
headers we are about to set. Avoids an assertion failure (and overruninng
the array) later.

diffstat:

 libexec/httpd/cgi-bozo.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 60a121515f02 -r d6d738070d9d libexec/httpd/cgi-bozo.c
--- a/libexec/httpd/cgi-bozo.c  Fri Mar 29 14:38:30 2019 +0000
+++ b/libexec/httpd/cgi-bozo.c  Fri Mar 29 14:46:44 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgi-bozo.c,v 1.47 2019/01/17 07:46:16 mrg Exp $        */
+/*     $NetBSD: cgi-bozo.c,v 1.48 2019/03/29 14:46:44 martin Exp $     */
 
 /*     $eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $        */
 
@@ -493,6 +493,7 @@
            (clen && *clen ? 1 : 0) +
            (request->hr_remotehost && *request->hr_remotehost ? 1 : 0) +
            (request->hr_remoteaddr && *request->hr_remoteaddr ? 1 : 0) +
+           (cgihandler ? 1 : 0) +
            bozo_auth_cgi_count(request) +
            (request->hr_serverport && *request->hr_serverport ? 1 : 0);