avoid segfaults on parse_object failure
Many call-sites of parse_object assume that they will get a non-NULL return value; this is not the case if we encounter an error while parsing the object. This patch adds a wrapper function around parse_object that handles dying automatically, and uses it anywhere we immediately try to access the return value as a non-NULL pointer (i.e., anywhere that we would currently segfault). This wrapper may also be useful in other places. The most obvious one is code like: o = parse_object(sha1); if (!o) die(...); However, these should not be mechanically converted to parse_object_or_die, as the die message is sometimes customized. Later patches can address these sites on a case-by-case basis. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
7e2010537e
commit
75a9549047
10
object.c
10
object.c
@ -185,6 +185,16 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
|
||||
return obj;
|
||||
}
|
||||
|
||||
struct object *parse_object_or_die(const unsigned char *sha1,
|
||||
const char *name)
|
||||
{
|
||||
struct object *o = parse_object(sha1);
|
||||
if (o)
|
||||
return o;
|
||||
|
||||
die(_("unable to parse object: %s"), name ? name : sha1_to_hex(sha1));
|
||||
}
|
||||
|
||||
struct object *parse_object(const unsigned char *sha1)
|
||||
{
|
||||
unsigned long size;
|
||||
|
Reference in New Issue
Block a user