===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/cgi.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/mandoc/cgi.c	2014/07/13 15:38:06	1.13
--- src/usr.bin/mandoc/cgi.c	2014/07/18 14:46:20	1.14
***************
*** 1,4 ****
! /*	$Id: cgi.c,v 1.13 2014/07/13 15:38:06 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
--- 1,4 ----
! /*	$Id: cgi.c,v 1.14 2014/07/18 14:46:20 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
***************
*** 966,973 ****
  	char	*dp;
  	size_t	 dpsz;
  
! 	if (NULL == (fp = fopen("manpath.conf", "r")))
! 		return;
  
  	while (NULL != (dp = fgetln(fp, &dpsz))) {
  		if ('\n' == dp[dpsz - 1])
--- 966,977 ----
  	char	*dp;
  	size_t	 dpsz;
  
! 	if (NULL == (fp = fopen("manpath.conf", "r"))) {
! 		fprintf(stderr, "%s/manpath.conf: %s\n",
! 			MAN_DIR, strerror(errno));
! 		pg_error_internal();
! 		exit(EXIT_FAILURE);
! 	}
  
  	while (NULL != (dp = fgetln(fp, &dpsz))) {
  		if ('\n' == dp[dpsz - 1])
***************
*** 975,979 ****
--- 979,989 ----
  		req->p = mandoc_realloc(req->p,
  		    (req->psz + 1) * sizeof(char *));
  		req->p[req->psz++] = mandoc_strndup(dp, dpsz);
+ 	}
+ 
+ 	if ( req->p == NULL ) {
+ 		fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR);
+ 		pg_error_internal();
+ 		exit(EXIT_FAILURE);
  	}
  }