sequencer: allow callers of read_author_script() to ignore fields

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 2adcf5a639c3a7d0154f07cf07f420f5d4f54007..b759c940f856f2daed6146a66c30328bbfb65ca7 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -824,9 +824,19 @@ int read_author_script(const char *path, char **name, char **email, char **date,
                error(_("missing 'GIT_AUTHOR_DATE'"));
        if (date_i < 0 || email_i < 0 || date_i < 0 || err)
                goto finish;
-       *name = kv.items[name_i].util;
-       *email = kv.items[email_i].util;
-       *date = kv.items[date_i].util;
+
+       if (name)
+               *name = kv.items[name_i].util;
+       else
+               free(kv.items[name_i].util);
+       if (email)
+               *email = kv.items[email_i].util;
+       else
+               free(kv.items[email_i].util);
+       if (date)
+               *date = kv.items[date_i].util;
+       else
+               free(kv.items[date_i].util);
        retval = 0;
 finish:
        string_list_clear(&kv, !!retval);