From 31da9febde0d822d73f99089109bacc1c3e36433 Mon Sep 17 00:00:00 2001
From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 11 Sep 2017 18:37:38 +0100
Subject: [PATCH] rmf.c: free(3) return value from m_mailpath() calls.

And add comment to m_mailpath() that its return value needs freeing.
---
 sbr/m_maildir.c |  1 +
 uip/rmf.c       | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 0f9584b6..c78b995a 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -36,6 +36,7 @@ m_maildir (char *folder)
 }
 
 
+/* Return value must be free(3)'d. */
 char *
 m_mailpath (char *folder)
 {
diff --git a/uip/rmf.c b/uip/rmf.c
index e8fa45f3..a99b53cf 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -37,6 +37,7 @@ main (int argc, char **argv)
     int defolder = 0, interactive = -1;
     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;
+    char *fp;
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
@@ -84,8 +85,10 @@ main (int argc, char **argv)
 	folder = getfolder (1);
 	defolder++;
     }
-    if (strcmp (m_mailpath (folder), pwd ()) == 0)
+    fp = m_mailpath(folder);
+    if (!strcmp(fp, pwd()))
 	adios (NULL, "sorry, you can't remove the current working directory");
+    free(fp);
 
     if (interactive == -1)
 	interactive = defolder;
@@ -124,6 +127,7 @@ static int
 rmf (char *folder)
 {
     int i, others;
+    char *fp;
     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;
@@ -136,8 +140,9 @@ rmf (char *folder)
 	    /* FALLTHRU */
 
 	case NOTOK: 
-	    snprintf (cur, sizeof(cur), "atr-%s-%s",
-			current, m_mailpath (folder));
+            fp = m_mailpath(folder);
+	    snprintf (cur, sizeof(cur), "atr-%s-%s", current, fp);
+            free(fp);
 	    if (!context_del (cur)) {
 		printf ("[+%s de-referenced]\n", folder);
 		return OK;
@@ -243,4 +248,6 @@ rma (char *folder)
 	    pp = np;
 	}
     }
+
+    free(cp);
 }
-- 
2.56.0