From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Tue, 12 Sep 2017 13:32:33 +0000 (+0100)
Subject: mh_oauth_cred_fn(): Always freshly allocate result.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/f1049604f9c88b9c8470bff8baee72414b724a9a?hp=5436cec1e0687a896ac15b1e8aa7808f172a396e

mh_oauth_cred_fn(): Always freshly allocate result.

If a `credential-file' context was found, and started with a `/', then
the m_defs's n_field was returned, otherwise a newly allocated string.
The caller couldn't tell whether to free the result or not so memory was
leaked.  Alter it to always freshly allocate the result.  Fixes
803f25412.
---

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index b5416380..0d4336d8 100644
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -127,28 +127,25 @@ mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
     return update_svc(svcinfo, svc_name, errbuf, errbuflen);
 }
 
+/* Return value must be free(3)'d. */
 const char *
 mh_oauth_cred_fn(const char *svc)
 {
-    char *result, *result_if_allocated;
-
-    char *component = mh_oauth_node_name_for_svc("credential-file", svc);
-    result = context_find(component);
-    free(component);
-
-    if (result == NULL) {
-        result = concat("oauth-", svc, NULL);
-        result_if_allocated = result;
-    } else {
-        result_if_allocated = NULL;
-    }
-
-    if (result[0] != '/') {
-        const char *tmp = m_maildir(result);
-        free(result_if_allocated);
-        result = getcpy(tmp);
-    }
-
-    return result;
+    char *key = mh_oauth_node_name_for_svc("credential-file", svc);
+    char *value = context_find(key);
+    free(key);
+
+    bool found = value;
+    if (found) {
+        if (*value == '/')
+            return mh_xstrdup(value);
+    } else
+        value = concat("oauth-", svc, NULL);
+
+    const char *md = m_maildir(value);
+    if (!found)
+        free(value);
+
+    return mh_xstrdup(md);
 }
 #endif