use get_tagged_oid()

Avoid derefencing ->tagged without checking for NULL by using the
convenience wrapper for getting the ID of the tagged object.  It die()s
when encountering a broken tag instead of segfaulting.

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

diff --git a/builtin/describe.c b/builtin/describe.c
index 200154297d5ea8baddda52e39cd4de302595bfcc..e048f85484c5ea2bd1d6b684aa10b407b2699c45 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -313,7 +313,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
                 */
                append_name(n, dst);
                if (longformat)
                 */
                append_name(n, dst);
                if (longformat)

-                       append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst);
+                       append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst);

                if (suffix)
                        strbuf_addstr(dst, suffix);
                return;
                if (suffix)
                        strbuf_addstr(dst, suffix);
                return;

diff --git a/builtin/log.c b/builtin/log.c
index 44b10b3415414c0723ace29d9defb62c1354e9d6..c4b35fdaf9b77c05da927fb3a2800a7fd8da9f91 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -627,6 +627,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
                        break;
                case OBJ_TAG: {
                        struct tag *t = (struct tag *)o;
                        break;
                case OBJ_TAG: {
                        struct tag *t = (struct tag *)o;

+                       struct object_id *oid = get_tagged_oid(t);

 
                        if (rev.shown_one)
                                putchar('\n');
 
                        if (rev.shown_one)
                                putchar('\n');


@@ -638,10 +639,10 @@ int cmd_show(int argc, const char **argv, const char *prefix)
                        rev.shown_one = 1;
                        if (ret)
                                break;
                        rev.shown_one = 1;
                        if (ret)
                                break;

-                       o = parse_object(the_repository, &t->tagged->oid);
+                       o = parse_object(the_repository, oid);

                        if (!o)
                                ret = error(_("could not read object %s"),
                        if (!o)
                                ret = error(_("could not read object %s"),

-                                           oid_to_hex(&t->tagged->oid));
+                                           oid_to_hex(oid));

                        objects[i].item = o;
                        i--;
                        break;
                        objects[i].item = o;
                        i--;
                        break;

diff --git a/builtin/replace.c b/builtin/replace.c
index 644b21ca8d57a75fa83ecbf0e58dd07a685cd9e4..2a4afb3b932c79a1ed04bdd283d810813d5c4a66 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -421,7 +421,7 @@ static int check_one_mergetag(struct commit *commit,
                if (get_oid(mergetag_data->argv[i], &oid) < 0)
                        return error(_("not a valid object name: '%s'"),
                                     mergetag_data->argv[i]);
                if (get_oid(mergetag_data->argv[i], &oid) < 0)
                        return error(_("not a valid object name: '%s'"),
                                     mergetag_data->argv[i]);

-               if (oideq(&tag->tagged->oid, &oid))
+               if (oideq(get_tagged_oid(tag), &oid))

                        return 0; /* found */
        }
 
                        return 0; /* found */
        }
 

diff --git a/packfile.c b/packfile.c
index fc43a6c52c75a32548c20bbc4a5aa7d0cc3ddd0d..a62ab4cb1744e655003a4efa92a33b02120616eb 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -2139,7 +2139,7 @@ static int add_promisor_object(const struct object_id *oid,
                        oidset_insert(set, &parents->item->object.oid);
        } else if (obj->type == OBJ_TAG) {
                struct tag *tag = (struct tag *) obj;
                        oidset_insert(set, &parents->item->object.oid);
        } else if (obj->type == OBJ_TAG) {
                struct tag *tag = (struct tag *) obj;

-               oidset_insert(set, &tag->tagged->oid);
+               oidset_insert(set, get_tagged_oid(tag));

        }
        return 0;
 }
        }
        return 0;
 }

diff --git a/ref-filter.c b/ref-filter.c
index f27cfc8c3e358fa27d7aec78c0b3c44c816402b3..8dcc17c0492ccc45f792e9284a6522a8cf1db826 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1766,7 +1766,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
         * If it is a tag object, see if we use a value that derefs
         * the object, and if we do grab the object it refers to.
         */
         * If it is a tag object, see if we use a value that derefs
         * the object, and if we do grab the object it refers to.
         */

-       oi_deref.oid = ((struct tag *)obj)->tagged->oid;
+       oi_deref.oid = *get_tagged_oid((struct tag *)obj);

 
        /*
         * NEEDSWORK: This derefs tag only once, which
 
        /*
         * NEEDSWORK: This derefs tag only once, which


@@ -1997,7 +1997,7 @@ static const struct object_id *match_points_at(struct oid_array *points_at,
        if (!obj)
                die(_("malformed object at '%s'"), refname);
        if (obj->type == OBJ_TAG)
        if (!obj)
                die(_("malformed object at '%s'"), refname);
        if (obj->type == OBJ_TAG)

-               tagged_oid = &((struct tag *)obj)->tagged->oid;
+               tagged_oid = get_tagged_oid((struct tag *)obj);

        if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0)
                return tagged_oid;
        return NULL;
        if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0)
                return tagged_oid;
        return NULL;