X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=27ef37bd914cd0af1da57f8dd60bf33f1509cfce;hp=514bbc642654b8bcf3f352e6e9514ffe4ee7fb4b;hb=917e87415edbeb7cd744b54ea4079b2e42899d3c;hpb=5143e5e840b5e9d95611f57fdc9d4b27af6f0564

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 514bbc64..27ef37bd 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -401,11 +401,14 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
 	    break;
 	mta = xstrdup (by);
 	token = strtok(mta," \t");
-	if (token == NULL)
+	if (token == NULL) {
+	    free (mta);
 	    break;
+	}
 	/* Now extract the last two components of the MTA host name
 	 * as domain and tld.
 	 */
+	domain = tld = NULL;
 	while ((ptr = strsep (&token, delim)) != NULL) {
 	    if (*ptr == '\0')
 		continue;
@@ -424,13 +427,13 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
 
 	    if (strcasestr(primary, domain)) {
 		free(mta);
-	    return primary;
-	}
-	for (i = 0; i < other_len; i++)
-	    if (strcasestr (other[i],domain)) {
-		free(mta);
-		return other[i];
+		return primary;
 	    }
+	    for (i = 0; i < other_len; i++)
+		if (strcasestr (other[i],domain)) {
+		    free(mta);
+		    return other[i];
+		}
 	}
 	free (mta);
     }