Commit 31faeb20 authored by Michael Haggerty's avatar Michael Haggerty Committed by Junio C Hamano

object_array_entry: fix memory handling of the name field

Previously, the memory management of the object_array_entry::name
field was inconsistent and undocumented.  object_array_entries are
ultimately created by a single function, add_object_array_with_mode(),
which has an argument "const char *name".  This function used to
simply set the name field to reference the string pointed to by the
name parameter, and nobody on the object_array side ever freed the
memory.  Thus, it assumed that the memory for the name field would be
managed by the caller, and that the lifetime of that string would be
at least as long as the lifetime of the object_array_entry.  But
callers were inconsistent:

* Some passed pointers to constant strings or argv entries, which was

* Some passed pointers to newly-allocated memory, but didn't arrange
  for the memory ever to be freed.

* Some passed the return value of sha1_to_hex(), which is a pointer to
  a statically-allocated buffer that can be overwritten at any time.

* Some passed pointers to refnames that they received from a
  for_each_ref()-type iteration, but the lifetimes of such refnames is
  not guaranteed by the refs API.

Bring consistency to this mess by changing object_array to make its
own copy for the object_array_entry::name field and free this memory
when an object_array_entry is deleted from the array.

Many callers were passing the empty string as the name parameter, so
as a performance optimization, treat the empty string specially.
Instead of making a copy, store a pointer to a statically-allocated
empty string to object_array_entry::name.  When deleting such an
entry, skip the free().

Change the callers that were already passing copies to
add_object_array_with_mode() to either skip the copy, or (if the
memory needed to be allocated anyway) freeing the memory itself.

A part of this commit effectively reverts

    70d26c6e read_revisions_from_stdin: make copies for handle_revision_arg

because the copying introduced by that commit (which is still
necessary) is now done at a deeper level.
Signed-off-by: default avatarMichael Haggerty <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 5de0c015
......@@ -281,7 +281,7 @@ int create_bundle(struct bundle_header *header, const char *path,
if (!get_sha1_hex(buf.buf + 1, sha1)) {
struct object *object = parse_object_or_die(sha1, buf.buf);
object->flags |= UNINTERESTING;
add_pending_object(&revs, object, xstrdup(buf.buf));
add_pending_object(&revs, object, buf.buf);
} else if (!get_sha1_hex(buf.buf, sha1)) {
struct object *object = parse_object_or_die(sha1, buf.buf);
......@@ -260,11 +260,18 @@ void add_object_array(struct object *obj, const char *name, struct object_array
add_object_array_with_mode(obj, name, array, S_IFINVALID);
* A zero-length string to which object_array_entry::name can be
* initialized without requiring a malloc/free.
static char object_array_slopbuf[1];
void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode)
unsigned nr = array->nr;
unsigned alloc = array->alloc;
struct object_array_entry *objects = array->objects;
struct object_array_entry *entry;
if (nr >= alloc) {
alloc = (alloc + 32) * 2;
......@@ -272,9 +279,16 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj
array->alloc = alloc;
array->objects = objects;
objects[nr].item = obj;
objects[nr].name = name;
objects[nr].mode = mode;
entry = &objects[nr];
entry->item = obj;
if (!name)
entry->name = NULL;
else if (!*name)
/* Use our own empty string instead of allocating one: */
entry->name = object_array_slopbuf;
entry->name = xstrdup(name);
entry->mode = mode;
array->nr = ++nr;
......@@ -289,6 +303,9 @@ void object_array_filter(struct object_array *array,
if (src != dst)
objects[dst] = objects[src];
} else {
if (objects[src].name != object_array_slopbuf)
array->nr = dst;
......@@ -319,6 +336,9 @@ void object_array_remove_duplicates(struct object_array *array)
if (src != array->nr)
objects[array->nr] = objects[src];
} else {
if (objects[src].name != object_array_slopbuf)
......@@ -11,7 +11,13 @@ struct object_array {
unsigned int alloc;
struct object_array_entry {
struct object *item;
const char *name;
* name or NULL. If non-NULL, the memory pointed to
* is owned by this object *except* if it points at
* object_array_slopbuf, which is a static copy of the
* empty string.
char *name;
unsigned mode;
} *objects;
......@@ -88,7 +88,9 @@ void add_object(struct object *obj,
struct name_path *path,
const char *name)
add_object_array(obj, path_name(path, name), p);
char *pn = path_name(path, name);
add_object_array(obj, pn, p);
static void mark_blob_uninteresting(struct blob *blob)
......@@ -1288,7 +1290,7 @@ static void read_revisions_from_stdin(struct rev_info *revs,
die("options not supported in --stdin mode");
if (handle_revision_arg(xstrdup(sb.buf), revs, 0,
if (handle_revision_arg(sb.buf, revs, 0,
die("bad revision '%s'", sb.buf);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment