Index: contrib/nvi/common/exf.c
===================================================================
--- contrib/nvi/common/exf.c
+++ contrib/nvi/common/exf.c
@@ -1188,6 +1188,8 @@
 		estr = wfname;
 		goto err;
 	}
+	if (d != NULL)
+		free(d);
 	if (bp != NULL)
 		FREE_SPACE(sp, bp, blen);
 	return (0);
Index: contrib/nvi/ex/ex_cscope.c
===================================================================
--- contrib/nvi/ex/ex_cscope.c
+++ contrib/nvi/ex/ex_cscope.c
@@ -497,8 +497,10 @@
 	np = strdup(np);
 	if ((tqp = create_cs_cmd(sp, np, &search)) == NULL)
 		goto err;
-	if (np != NULL)
+	if (np != NULL) {
 		free(np);
+		np = NULL;
+	}
 
 	/*
 	 * Stick the current context in a convenient place, we'll lose it