===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.71
retrieving revision 1.74
diff -u -p -r1.71 -r1.74
--- mandoc/mandocdb.c	2013/07/02 13:26:52	1.71
+++ mandoc/mandocdb.c	2013/10/27 16:09:44	1.74
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.71 2013/07/02 13:26:52 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.74 2013/10/27 16:09:44 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -685,7 +685,7 @@ filescan(const char *file)
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say(file, NULL);
 		return;
-	} else if (strstr(buf, basedir) != buf) {
+	} else if (OP_TEST != op && strstr(buf, basedir) != buf) {
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say("", "%s: outside base directory", buf);
 		return;
@@ -836,13 +836,13 @@ ofadd(int dform, const char *file, const char *name, c
 	if (NULL == arch)
 		arch = "";
 
-	sform = FORM_NONE;
-	if (NULL != sec && *sec <= '9' && *sec >= '1')
-		sform = FORM_SRC;
-	else if (NULL != sec && *sec == '0') {
+	if ('0' == *sec) {
 		sec = dsec;
 		sform = FORM_CAT;
-	}
+	} else if ('1' <= *sec && '9' >= *sec)
+		sform = FORM_SRC;
+	else
+		sform = FORM_NONE;
 
 	of = mandoc_calloc(1, sizeof(struct of));
 	strlcpy(of->file, file, PATH_MAX);
@@ -1792,7 +1792,7 @@ dbindex(struct mchars *mc, int form, const struct of *
 		return;
 
 	desc = "";
-	if (NULL != of->desc) {
+	if (NULL != of->desc && '\0' != *of->desc) {
 		key = ohash_find(&strings,
 			ohash_qlookup(&strings, of->desc));
 		assert(NULL != key);