X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=873a7c4c15f97edf037ee3a3b0fff782713ded5d;hp=912999e1a65e645b7b893ac49d1df55ad197d51c;hb=caae152772e6d15333e392e8175799c8475fd902;hpb=c35ac0bdbd51ddc606cbeb35e8b7b86e450b4b74

diff --git a/notmuch-show.c b/notmuch-show.c
index 912999e1..873a7c4c 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -255,7 +255,9 @@ _extract_email_address (const void *ctx, const char *from)
     email = talloc_strdup (ctx, email);
 
   DONE:
-    /* XXX: How to free addresses here? */
+    if (addresses)
+	g_object_unref (addresses);
+
     return email;
    }
 
@@ -936,6 +938,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     params.cryptoctx = NULL;
     params.decrypt = 0;
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
 	if (strcmp (argv[i], "--") == 0) {
 	    i++;