git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] revision.c: fix possible null pointer access

From
Stefan Naewe <stefan.naewe@gmail.com>
Date
Dec 3, 2015, 21:15 UTC
Message-ID
<CAJzBP5SNeuMcKLqdCBrHsYHdmOnuvyrvk7wao4b30Op2SE_ykw@mail.gmail.com>
In-Reply-To
<xmqqlh9bthyb.fsf@gitster.mtv.corp.google.com>
On Thu, Dec 3, 2015 at 9:06 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 44 quoted lines
>
> Stefan Naewe <stefan.naewe@gmail.com> writes:
>
> > Two functions dereference a tree pointer before checking
>
> Reading them a bit carefully, a reader would notice that they
> actually do not dereference the pointer at all.  It just computes
> another pointer and that is done by adding the offset of object
> member in the tree struct.
>
> > if the pointer is valid. Fix that by doing the check first.
> >
> > Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
> > ---
> > This has been reported through the CppHints newsletter (http://cpphints.com/hints/40)
> > but doesn't seem to have made its way to the ones who care (the git list
> > that is...)
>
> Nobody would be surprised, unless the newsletter was sent to this
> list, which I do not think it was (but if it was sent while I was
> away, then it is very possible that I didn't see it).
>
> >  revision.c | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/revision.c b/revision.c
> > index 0fbb684..bb40179 100644
> > --- a/revision.c
> > +++ b/revision.c
> > @@ -104,7 +104,12 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
> >  {
> >       struct tree_desc desc;
> >       struct name_entry entry;
> > -     struct object *obj = &tree->object;
> > +     struct object *obj;
> > +
> > +     if (!tree)
> > +             return;
> > +
> > +     obj = &tree->object;
>
> This is questionable; if you check all the callers of this function
> (there are two of them, I think), you would notice that they both
> know that tree cannot be NULL here.
OK.
Show 21 quoted lines
>
> >
> >       if (!has_sha1_file(obj->sha1))
> >               return;
> > @@ -135,10 +140,13 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
> >
> >  void mark_tree_uninteresting(struct tree *tree)
> >  {
> > -     struct object *obj = &tree->object;
> > +     struct object *obj;
> >
> >       if (!tree)
> >               return;
> > +
> > +     obj = &tree->object;
> > +
> >       if (obj->flags & UNINTERESTING)
> >               return;
>
> This one is not wrong per-se, but an unnecessary change, because no
> deferencing is involved.
But 'tree->object' is dereferencing tree, isn't it ? Like '(*tree).object'.
??
> At least, please lose the blank line after
> the new assignment.
Will do, if you want this patch at all.
> >       obj->flags |= UNINTERESTING;
>
> Thanks.
Thanks,
  Stefan
-- 
----------------------------------------------------------------
python -c "print '73746566616e2e6e6165776540676d61696c2e636f6d'.decode('hex')"
Previous: Junio C HamanoNext: Philip Oakley
Message 3 of 10 in “revision.c: fix possible null pointer access”
  1. revision.c: fix possible null pointer accessStefan Naewe, Dec 3, 2015
  2. Junio C HamanoDec 3, 2015
  3. Stefan NaeweDec 3, 2015
  4. Philip OakleyDec 3, 2015
  5. Stefan BellerDec 3, 2015
  6. Junio C HamanoDec 4, 2015
  7. Jeff KingDec 4, 2015
  8. revision.c: fix possible null pointer accessStefan Naewe, Dec 5, 2015
  9. Junio C HamanoDec 7, 2015
  10. Johannes SixtDec 7, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.