builtin-tag.c: Fix two memory leaks and minor notation changes.

A repeated call to read_sha1_file was not freing memory
when the buffer was allocated but returned size was zero.

Also, now the program does not allow many -F or -m options,
which was a bug too because it was not freing the memory
allocated for any previous -F or -m options.

Tests are provided for ensuring that only one option
-F or -m is given. Also, another test is shipped here,
to check that "git tag" fails when a non-existing file
is passed to the -F option, something that git-tag.sh
allowed creating the tag with an empty message.

Signed-off-by: Carlos Rica <jasampler@gmail.com>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-tag.c b/builtin-tag.c
index 81d37ce9015d108ac16038cb6c9e12a6b4a197b9..d6d38ad123cb0f354a6bd7007eddf8fb1b4d126c 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -89,14 +89,19 @@ static int show_reference(const char *refname, const unsigned char *sha1,
                printf("%-15s ", refname);
 
                sp = buf = read_sha1_file(sha1, &type, &size);
                printf("%-15s ", refname);
 
                sp = buf = read_sha1_file(sha1, &type, &size);

-               if (!buf || !size)
+               if (!buf)

                        return 0;
                        return 0;

+               if (!size) {
+                       free(buf);
+                       return 0;
+               }

                /* skip header */
                while (sp + 1 < buf + size &&
                                !(sp[0] == '\n' && sp[1] == '\n'))
                        sp++;
                /* only take up to "lines" lines, and strip the signature */
                /* skip header */
                while (sp + 1 < buf + size &&
                                !(sp[0] == '\n' && sp[1] == '\n'))
                        sp++;
                /* only take up to "lines" lines, and strip the signature */

-               for (i = 0, sp += 2; i < filter->lines && sp < buf + size &&
+               for (i = 0, sp += 2;
+                               i < filter->lines && sp < buf + size &&

                                prefixcmp(sp, PGP_SIGNATURE "\n");
                                i++) {
                        if (i)
                                prefixcmp(sp, PGP_SIGNATURE "\n");
                                i++) {
                        if (i)


@@ -137,10 +142,10 @@ static int list_tags(const char *pattern, int lines)
        return 0;
 }
 
        return 0;
 }
 

-typedef int (*func_tag)(const char *name, const char *ref,
+typedef int (*each_tag_name_fn)(const char *name, const char *ref,

                                const unsigned char *sha1);
 
                                const unsigned char *sha1);
 

-static int do_tag_names(const char **argv, func_tag fn)
+static int for_each_tag_name(const char **argv, each_tag_name_fn fn)

 {
        const char **p;
        char ref[PATH_MAX];
 {
        const char **p;
        char ref[PATH_MAX];


@@ -195,7 +200,7 @@ static ssize_t do_sign(char *buffer, size_t size, size_t max)
 
        if (!*signingkey) {
                if (strlcpy(signingkey, git_committer_info(1),
 
        if (!*signingkey) {
                if (strlcpy(signingkey, git_committer_info(1),

-                               sizeof(signingkey)) >= sizeof(signingkey))
+                               sizeof(signingkey)) > sizeof(signingkey) - 1)

                        return error("committer info too long.");
                bracket = strchr(signingkey, '>');
                if (bracket)
                        return error("committer info too long.");
                bracket = strchr(signingkey, '>');
                if (bracket)


@@ -258,7 +263,7 @@ static void create_tag(const unsigned char *object, const char *tag,
        unsigned long size = 0;
 
        type = sha1_object_info(object, NULL);
        unsigned long size = 0;
 
        type = sha1_object_info(object, NULL);

-       if (type <= 0)
+       if (type <= OBJ_NONE)

            die("bad object type.");
 
        header_len = snprintf(header_buf, sizeof(header_buf),
            die("bad object type.");
 
        header_len = snprintf(header_buf, sizeof(header_buf),


@@ -271,7 +276,7 @@ static void create_tag(const unsigned char *object, const char *tag,
                          tag,
                          git_committer_info(1));
 
                          tag,
                          git_committer_info(1));
 

-       if (header_len >= sizeof(header_buf))
+       if (header_len > sizeof(header_buf) - 1)

                die("tag header too big.");
 
        if (!message) {
                die("tag header too big.");
 
        if (!message) {


@@ -366,6 +371,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                        i++;
                        if (i == argc)
                                die("option -m needs an argument.");
                        i++;
                        if (i == argc)
                                die("option -m needs an argument.");

+                       if (message)
+                               die("only one -F or -m option is allowed.");

                        message = xstrdup(argv[i]);
                        continue;
                }
                        message = xstrdup(argv[i]);
                        continue;
                }


@@ -377,6 +384,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                        i++;
                        if (i == argc)
                                die("option -F needs an argument.");
                        i++;
                        if (i == argc)
                                die("option -F needs an argument.");

+                       if (message)
+                               die("only one -F or -m option is allowed.");

 
                        if (!strcmp(argv[i], "-"))
                                fd = 0;
 
                        if (!strcmp(argv[i], "-"))
                                fd = 0;


@@ -405,15 +414,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                                die("argument to option -u too long");
                        continue;
                }
                                die("argument to option -u too long");
                        continue;
                }

-               if (!strcmp(arg, "-l")) {
+               if (!strcmp(arg, "-l"))

                        return list_tags(argv[i + 1], lines);
                        return list_tags(argv[i + 1], lines);

-               }
-               if (!strcmp(arg, "-d")) {
-                       return do_tag_names(argv + i + 1, delete_tag);
-               }
-               if (!strcmp(arg, "-v")) {
-                       return do_tag_names(argv + i + 1, verify_tag);
-               }
+               if (!strcmp(arg, "-d"))
+                       return for_each_tag_name(argv + i + 1, delete_tag);
+               if (!strcmp(arg, "-v"))
+                       return for_each_tag_name(argv + i + 1, verify_tag);

                usage(builtin_tag_usage);
        }
 
                usage(builtin_tag_usage);
        }
 


@@ -431,7 +437,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
        if (get_sha1(object_ref, object))
                die("Failed to resolve '%s' as a valid ref.", object_ref);
 
        if (get_sha1(object_ref, object))
                die("Failed to resolve '%s' as a valid ref.", object_ref);
 

-       if (snprintf(ref, sizeof(ref), "refs/tags/%s", tag) >= sizeof(ref))
+       if (snprintf(ref, sizeof(ref), "refs/tags/%s", tag) > sizeof(ref) - 1)

                die("tag name too long: %.*s...", 50, tag);
        if (check_ref_format(ref))
                die("'%s' is not a valid tag name.", tag);
                die("tag name too long: %.*s...", 50, tag);
        if (check_ref_format(ref))
                die("'%s' is not a valid tag name.", tag);

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index a0be1646194ef7248184bfaf764bb8cc3b0eadb8..c4fa4461f764dd936f231dae3905605b0ed0c28a 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -332,6 +332,33 @@ test_expect_success 'creating an annotated tag with -F - should succeed' '
        git diff expect actual
 '
 
        git diff expect actual
 '
 

+test_expect_success \
+       'trying to create a tag with a non-existing -F file should fail' '
+       ! test -f nonexistingfile &&
+       ! tag_exists notag &&
+       ! git-tag -F nonexistingfile notag &&
+       ! tag_exists notag
+'
+
+test_expect_success \
+       'trying to create tags giving many -m or -F options should fail' '
+       echo "message file 1" >msgfile1 &&
+       echo "message file 2" >msgfile2 &&
+       ! tag_exists msgtag &&
+       ! git-tag -m "message 1" -m "message 2" msgtag &&
+       ! tag_exists msgtag &&
+       ! git-tag -F msgfile1 -F msgfile2 msgtag &&
+       ! tag_exists msgtag &&
+       ! git-tag -m "message 1" -F msgfile1 msgtag &&
+       ! tag_exists msgtag &&
+       ! git-tag -F msgfile1 -m "message 1" msgtag &&
+       ! tag_exists msgtag &&
+       ! git-tag -F msgfile1 -m "message 1" -F msgfile2 msgtag &&
+       ! tag_exists msgtag &&
+       ! git-tag -m "message 1" -F msgfile1 -m "message 2" msgtag &&
+       ! tag_exists msgtag
+'
+

 # blank and empty messages:
 
 get_tag_header empty-annotated-tag $commit commit $time >expect
 # blank and empty messages:
 
 get_tag_header empty-annotated-tag $commit commit $time >expect


@@ -648,6 +675,14 @@ test_expect_success 'creating a signed tag with -F - should succeed' '
        git diff expect actual
 '
 
        git diff expect actual
 '
 

+test_expect_success \
+       'trying to create a signed tag with non-existing -F file should fail' '
+       ! test -f nonexistingfile &&
+       ! tag_exists nosigtag &&
+       ! git-tag -s -F nonexistingfile nosigtag &&
+       ! tag_exists nosigtag
+'
+

 test_expect_success 'verifying a signed tag should succeed' \
        'git-tag -v signed-tag'
 
 test_expect_success 'verifying a signed tag should succeed' \
        'git-tag -v signed-tag'