1 files changed, 7 insertions, 2 deletions
diff --git a/mandocdb.c b/mandocdb.c
index 7231bfb7..fa59d564 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1452,7 +1452,8 @@ static void
 ofile_argbuild(int argc, char *argv[], struct of **of)
 {
 	char		 buf[MAXPATHLEN];
-	char		*sec, *arch, *title, *p;
+	const char	*sec, *arch, *title;
+	char		*p;
 	int		 i, src_form;
 	struct of	*nof;
 
@@ -1756,6 +1757,7 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch,
 
 		if (verb > 1)
 			printf("%s: scheduling\n", buf);
+
 		if (NULL == *of) {
 			*of = nof;
 			(*of)->first = nof;
@@ -1774,7 +1776,10 @@ ofile_free(struct of *of)
 {
 	struct of	*nof;
 
-	while (of) {
+	if (NULL != of)
+		of = of->first;
+
+	while (NULL != of) {
 		nof = of->next;
 		free(of->fname);
 		free(of->sec);