Skip to content

Commit 5701c3d

Browse files
committed
Merge branch 'sb/parse-object-buffer-eaten'
* sb/parse-object-buffer-eaten: parse_object_buffer: correct freeing the buffer
2 parents 4ca8ae7 + 8e92e8f commit 5701c3d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

object.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
145145
struct object *parse_object_buffer(const unsigned char *sha1, enum object_type type, unsigned long size, void *buffer, int *eaten_p)
146146
{
147147
struct object *obj;
148-
int eaten = 0;
148+
*eaten_p = 0;
149149

150150
obj = NULL;
151151
if (type == OBJ_BLOB) {
@@ -164,7 +164,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
164164
if (!tree->object.parsed) {
165165
if (parse_tree_buffer(tree, buffer, size))
166166
return NULL;
167-
eaten = 1;
167+
*eaten_p = 1;
168168
}
169169
}
170170
} else if (type == OBJ_COMMIT) {
@@ -174,7 +174,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
174174
return NULL;
175175
if (!commit->buffer) {
176176
commit->buffer = buffer;
177-
eaten = 1;
177+
*eaten_p = 1;
178178
}
179179
obj = &commit->object;
180180
}
@@ -191,7 +191,6 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
191191
}
192192
if (obj && obj->type == OBJ_NONE)
193193
obj->type = type;
194-
*eaten_p = eaten;
195194
return obj;
196195
}
197196

0 commit comments

Comments
 (0)