1 files changed, 13 insertions, 1 deletions
diff --git a/mandocdb.c b/mandocdb.c
index 50a9bd91..ceda5048 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -512,7 +512,7 @@ main(int argc, char *argv[])
 				goto out;
 
 			mpages_merge(mc, mp);
-			if (warnings &&
+			if (warnings && !nodb &&
 			    ! (MPARSE_QUICK & mparse_options))
 				names_check();
 			dbclose(0);
@@ -1996,6 +1996,18 @@ dbadd(struct mpage *mpage, struct mchars *mc)
 	mlink = mpage->mlinks;
 
 	if (nodb) {
+		for (key = ohash_first(&names, &slot); NULL != key;
+		     key = ohash_next(&names, &slot)) {
+			if (key->rendered != key->key)
+				free(key->rendered);
+			free(key);
+		}
+		for (key = ohash_first(&strings, &slot); NULL != key;
+		     key = ohash_next(&strings, &slot)) {
+			if (key->rendered != key->key)
+				free(key->rendered);
+			free(key);
+		}
 		if (0 == debug)
 			return;
 		while (NULL != mlink) {