mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 08:56:08 +02:00
Code

Merge branch 'sb/parse-object-buffer-eaten' 

* sb/parse-object-buffer-eaten:
  parse_object_buffer: correct freeing the buffer
This commit is contained in:
Junio C Hamano 2013-07-22 11:23:32 -07:00
parent 4ca8ae712c 8e92e8f242
commit 5701c3d701
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
object.c
View File

@ -145,7 +145,7 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
struct object *parse_object_buffer(const unsigned char *sha1, enum object_type type, unsigned long size, void *buffer, int *eaten_p)
{
struct object *obj;
int eaten = 0;
*eaten_p = 0;
obj = NULL;
if (type == OBJ_BLOB) {
@ -164,7 +164,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
if (!tree->object.parsed) {
if (parse_tree_buffer(tree, buffer, size))
return NULL;
eaten = 1;
*eaten_p = 1;
}
}
} else if (type == OBJ_COMMIT) {
@ -174,7 +174,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
return NULL;
if (!commit->buffer) {
commit->buffer = buffer;
eaten = 1;
*eaten_p = 1;
}
obj = &commit->object;
}
@ -191,7 +191,6 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
}
if (obj && obj->type == OBJ_NONE)
obj->type = type;
*eaten_p = eaten;
return obj;
}