am: release strbufs after use in detect_patch_format()
authorRene Scharfe <l.s.r@web.de>
Wed, 30 Aug 2017 17:49:32 +0000 (19:49 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Sep 2017 23:49:26 +0000 (08:49 +0900)
Don't reset the strbufs l2 and l3 before use as if they were static, but
release them at the end instead.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/am.c
index c369dd1dce2d705206414d0bbf5a4415d9487cab..3c50b03faa23fdaff053b1104cec99a573e8f9f1 100644 (file)
@@ -671,9 +671,7 @@ static int detect_patch_format(const char **paths)
                goto done;
        }
 
                goto done;
        }
 
-       strbuf_reset(&l2);
        strbuf_getline(&l2, fp);
        strbuf_getline(&l2, fp);
-       strbuf_reset(&l3);
        strbuf_getline(&l3, fp);
 
        /*
        strbuf_getline(&l3, fp);
 
        /*
@@ -696,6 +694,8 @@ static int detect_patch_format(const char **paths)
 done:
        fclose(fp);
        strbuf_release(&l1);
 done:
        fclose(fp);
        strbuf_release(&l1);
+       strbuf_release(&l2);
+       strbuf_release(&l3);
        return ret;
 }
 
        return ret;
 }