am: release strbuf on error return in hg_patch_to_mail()

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/am.c b/builtin/am.c
index 3c50b03faa23fdaff053b1104cec99a573e8f9f1..3d38b3fe9fdc15bcab773565fcc0b5e5dfb0ebaf 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -881,6 +881,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
 static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 {
        struct strbuf sb = STRBUF_INIT;
 static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 {
        struct strbuf sb = STRBUF_INIT;

+       int rc = 0;

 
        while (!strbuf_getline_lf(&sb, in)) {
                const char *str;
 
        while (!strbuf_getline_lf(&sb, in)) {
                const char *str;


@@ -894,19 +895,27 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 
                        errno = 0;
                        timestamp = parse_timestamp(str, &end, 10);
 
                        errno = 0;
                        timestamp = parse_timestamp(str, &end, 10);

-                       if (errno)
-                               return error(_("invalid timestamp"));
+                       if (errno) {
+                               rc = error(_("invalid timestamp"));
+                               goto exit;
+                       }

 
 

-                       if (!skip_prefix(end, " ", &str))
-                               return error(_("invalid Date line"));
+                       if (!skip_prefix(end, " ", &str)) {
+                               rc = error(_("invalid Date line"));
+                               goto exit;
+                       }

 
                        errno = 0;
                        tz = strtol(str, &end, 10);
 
                        errno = 0;
                        tz = strtol(str, &end, 10);

-                       if (errno)
-                               return error(_("invalid timezone offset"));
+                       if (errno) {
+                               rc = error(_("invalid timezone offset"));
+                               goto exit;
+                       }

 
 

-                       if (*end)
-                               return error(_("invalid Date line"));
+                       if (*end) {
+                               rc = error(_("invalid Date line"));
+                               goto exit;
+                       }

 
                        /*
                         * mercurial's timezone is in seconds west of UTC,
 
                        /*
                         * mercurial's timezone is in seconds west of UTC,


@@ -931,9 +940,9 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
                fwrite(sb.buf, 1, sb.len, out);
                strbuf_reset(&sb);
        }
                fwrite(sb.buf, 1, sb.len, out);
                strbuf_reset(&sb);
        }

-
+exit:

        strbuf_release(&sb);
        strbuf_release(&sb);

-       return 0;
+       return rc;

 }
 
 /**
 }
 
 /**