From: Jeff King <peff@peff•net>
To: git@vger•kernel.org
Subject: [PATCH 2/7] upload-pack: do not check NULL return of lookup_unknown_object
Date: Fri, 13 Mar 2015 00:42:25 -0400 [thread overview]
Message-ID: <20150313044224.GB18532@peff.net> (raw)
In-Reply-To: <20150313044101.GA18476@peff.net>
We check whether the return value of lookup_unknown_object
is NULL, but some code paths dereference it before our
check. This turns out not to be capable of causing a
segfault, though. The lookup_unknown_object function will
never return NULL, since the whole point is to allocate an
object struct if it does not find an existing one. So the
code here is not wrong, it is just confusing. Let's just
drop the NULL check.
Signed-off-by: Jeff King <peff@peff•net>
---
upload-pack.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index c8e8713..aa84576 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -689,8 +689,6 @@ static int mark_our_ref(const char *refname, const unsigned char *sha1)
o->flags |= HIDDEN_REF;
return 1;
}
- if (!o)
- die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
o->flags |= OUR_REF;
return 0;
}
--
2.3.2.472.geadab3c
next prev parent reply other threads:[~2015-03-13 4:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-13 4:41 [PATCH 0/7] fix transfer.hiderefs with smart http Jeff King
2015-03-13 4:42 ` [PATCH 1/7] upload-pack: fix transfer.hiderefs over smart-http Jeff King
2015-03-13 6:21 ` Junio C Hamano
2015-03-13 4:42 ` Jeff King [this message]
2015-03-13 4:48 ` [PATCH 3/7] t: translate SIGINT to an exit Jeff King
2015-03-13 4:50 ` [PATCH 4/7] t: redirect stderr GIT_TRACE to descriptor 4 Jeff King
2015-03-13 4:51 ` [PATCH 5/7] t: pass GIT_TRACE through Apache Jeff King
2015-03-13 4:53 ` [PATCH 6/7] t5541: move run_with_cmdline_limit to test-lib.sh Jeff King
2015-03-13 6:45 ` Eric Sunshine
2015-03-13 4:57 ` [PATCH 7/7] t5551: make EXPENSIVE test cheaper Jeff King
2015-03-13 4:59 ` [PATCH 0/7] fix transfer.hiderefs with smart http Jeff King
2015-03-13 5:21 ` Duy Nguyen
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=20150313044224.GB18532@peff.net \
--to=peff@peff$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox