From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Olga Telezhnaya <olyatelezhnaya@gmail.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 3/4] ref-filter: merge get_obj and get_object
Date: Tue, 10 Jul 2018 11:19:25 +0200 [thread overview]
Message-ID: <20180710091925.11061-1-szeder.dev@gmail.com> (raw)
In-Reply-To: <010201647e19c24c-fd353913-225a-4153-aa0f-6ddf41ae6354-000000@eu-west-1.amazonses.com>
> static int get_object(struct ref_array_item *ref, const struct object_id *oid,
> - int deref, struct object **obj, struct strbuf *err)
> + int deref, struct object **obj, struct strbuf *err)
> {
> int eaten;
Here the variable 'eaten' is declared, but left uninitialized. This
was fine until now, because ...
> int ret = 0;
> unsigned long size;
> - void *buf = get_obj(oid, obj, &size, &eaten);
... this line used to set it anyway.
> + enum object_type type;
> + void *buf = read_object_file(oid, &type, &size);
> if (!buf)
> ret = strbuf_addf_ret(err, -1, _("missing object %s for %s"),
> oid_to_hex(oid), ref->refname);
> - else if (!*obj)
> - ret = strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
> - oid_to_hex(oid), ref->refname);
> - else
> - grab_values(ref->value, deref, *obj, buf, size);
> + else {
> + *obj = parse_object_buffer(oid, type, size, buf, &eaten);
However, with this change 'eaten' is only set here conditionally: if
read_object_file() doesn't return a valid object buffer, then 'eaten'
remains uninitialized.
> + if (!*obj)
> + ret = strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
> + oid_to_hex(oid), ref->refname);
> + else
> + grab_values(ref->value, deref, *obj, buf, size);
> + }
> if (!eaten)
And ultimately this condition could depend on an uninitialized value.
> free(buf);
> return ret;
>
> --
> https://github.com/git/git/pull/520
>
next prev parent reply other threads:[~2018-07-10 9:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 8:12 [PATCH 1/4] ref-filter: add info_source to valid_atom Olga Telezhnaya
2018-07-09 8:12 ` [PATCH 2/4] ref-filter: add empty values to technical fields Olga Telezhnaya
2018-07-09 22:39 ` Junio C Hamano
2018-07-10 7:51 ` Оля Тележная
2018-07-09 8:12 ` [PATCH 4/4] ref-filter: use oid_object_info() to get object Olga Telezhnaya
2018-07-09 8:12 ` [PATCH 3/4] ref-filter: merge get_obj and get_object Olga Telezhnaya
2018-07-10 9:19 ` SZEDER Gábor [this message]
2018-07-10 9:23 ` Johannes Schindelin
2018-07-10 10:29 ` SZEDER Gábor
2018-07-10 10:41 ` Оля Тележная
2018-07-13 12:43 ` [PATCH v2 1/4] ref-filter: add info_source to valid_atom Olga Telezhnaya
2018-07-13 12:43 ` [PATCH v2 2/4] ref-filter: fill empty fields with empty values Olga Telezhnaya
2018-07-13 12:43 ` [PATCH v2 3/4] ref-filter: merge get_obj and get_object Olga Telezhnaya
2018-07-13 12:43 ` [PATCH v2 4/4] ref-filter: use oid_object_info() to get object Olga Telezhnaya
2018-07-16 20:53 ` Junio C Hamano
2018-07-17 7:44 ` Оля Тележная
2018-07-17 22:17 ` Junio C Hamano
2018-07-17 8:22 ` [PATCH v3 1/5] ref-filter: add info_source to valid_atom Olga Telezhnaya
2018-07-17 8:22 ` [PATCH v3 5/5] ref-filter: use oid_object_info() to get object Olga Telezhnaya
2018-07-17 8:22 ` [PATCH v3 4/5] ref-filter: merge get_obj and get_object Olga Telezhnaya
2018-07-17 8:22 ` [PATCH v3 2/5] ref-filter: fill empty fields with empty values Olga Telezhnaya
2018-07-17 8:22 ` [PATCH v3 3/5] ref-filter: initialize eaten variable Olga Telezhnaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180710091925.11061-1-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=olyatelezhnaya@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.