From: schwarze <schwarze@openbsd.org>
Date: Fri, 25 Jul 2014 19:36:02 +0000 (+0000)
Subject: oops, we must not try to validate a manpath we don't have;
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b16bb5ddcfd1e9f8e3f35c51100a6de58642ffdc;p=openbsd

oops, we must not try to validate a manpath we don't have;
fixing an oversight introduced in rev. 1.17
---

diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index 8f89965c55d..2c0b8c2aebe 100644
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.28 2014/07/25 18:19:33 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.29 2014/07/25 19:36:02 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -1082,7 +1082,8 @@ main(void)
 	if (NULL != (querystring = getenv("QUERY_STRING")))
 		http_parse(&req, querystring);
 
-	if ( ! validate_manpath(&req, req.q.manpath)) {
+	if ( ! (NULL == req.q.manpath ||
+	    validate_manpath(&req, req.q.manpath))) {
 		pg_error_badrequest(
 		    "You specified an invalid manpath.");
 		return(EXIT_FAILURE);