git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/7] move setting of object->type to alloc_* functions

From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date
Jul 12, 2014, 14:44 UTC
Message-ID
<53C149B6.7010705@ramsay1.demon.co.uk>
In-Reply-To
<20140711084611.GB5625@sigill.intra.peff.net>
On 11/07/14 09:46, Jeff King wrote:
Show 57 quoted lines
> The "struct object" type implements basic object
> polymorphism.  Individual instances are allocated as
> concrete types (or as a union type that can store any
> object), and a "struct object *" can be cast into its real
> type after examining its "type" enum.  This means it is
> dangerous to have a type field that does not match the
> allocation (e.g., setting the type field of a "struct blob"
> to "OBJ_COMMIT" would mean that a reader might read past the
> allocated memory).
> 
> In most of the current code this is not a problem; the first
> thing we do after allocating an object is usually to set its
> type field by passing it to create_object. However, the
> virtual commits we create in merge-recursive.c do not ever
> get their type set. This does not seem to have caused
> problems in practice, though (presumably because we always
> pass around a "struct commit" pointer and never even look at
> the type).
> 
> We can fix this oversight and also make it harder for future
> code to get it wrong by setting the type directly in the
> object allocation functions.
> 
> This will also make it easier to fix problems with commit
> index allocation, as we know that any object allocated by
> alloc_commit_node will meet the invariant that an object
> with an OBJ_COMMIT type field will have a unique index
> number.
> 
> Signed-off-by: Jeff King <peff@peff.net>
> ---
>  alloc.c         | 18 ++++++++++--------
>  blob.c          |  2 +-
>  builtin/blame.c |  1 -
>  commit.c        |  2 +-
>  object.c        |  5 ++---
>  object.h        |  2 +-
>  tag.c           |  2 +-
>  tree.c          |  2 +-
>  8 files changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/alloc.c b/alloc.c
> index d7c3605..fd5fcb7 100644
> --- a/alloc.c
> +++ b/alloc.c
> @@ -18,11 +18,11 @@
>  
>  #define BLOCKING 1024
>  
> -#define DEFINE_ALLOCATOR(name, type)				\
> +#define DEFINE_ALLOCATOR(name, flag, type)			\
>  static struct alloc_state name##_state;				\
>  void *alloc_##name##_node(void)					\
>  {								\
> -	return alloc_node(&name##_state, sizeof(type));		\
> +	return alloc_node(&name##_state, flag, sizeof(type));	\
>  }
I don't particularly like 'flag' here. (not a massive dislike, mind you:)
Perhaps: flag->object_type, type->node_type?
Or, if that's too verbose, maybe just: flag->type, type->node?

ATB, Ramsay Jones

Previous: Jeff KingNext: Jeff King
Message 9 of 35 in “alloc.c: remove the redundant commit_count variable”
  1. 2/2 alloc.c: remove the redundant commit_count variableRamsay Jones, Jul 10, 2014
  2. Jeff KingJul 11, 2014
  3. Ramsay JonesJul 11, 2014
  4. Jeff KingJul 11, 2014
  5. Ramsay JonesJul 11, 2014
  6. 0/7 ensure index is set for all OBJ_COMMIT objects variableJeff King, Jul 11, 2014
  7. 1/7 alloc.c: remove the alloc_raw_commit_node() functionJeff King, Jul 11, 2014
  8. 2/7 move setting of object->type to alloc_* functionsJeff King, Jul 11, 2014
  9. Ramsay JonesJul 12, 2014
  10. Jeff KingJul 12, 2014
  11. Jeff KingJul 13, 2014
  12. 1/8 alloc.c: remove the alloc_raw_commit_node() functionJeff King, Jul 13, 2014
  13. Junio C HamanoJul 15, 2014
  14. 2/8 alloc: write out allocator definitionsJeff King, Jul 13, 2014
  15. Junio C HamanoJul 15, 2014
  16. 3/8 move setting of object->type to alloc_* functionsJeff King, Jul 13, 2014
  17. Junio C HamanoJul 15, 2014
  18. 4/8 parse_object_buffer: do not set object typeJeff King, Jul 13, 2014
  19. 5/8 add object_as_type helper for casting objectsJeff King, Jul 13, 2014
  20. 6/8 alloc: factor out commit indexJeff King, Jul 13, 2014
  21. 7/8 object_as_type: set commit indexJeff King, Jul 13, 2014
  22. 8/8 diff-tree: avoid lookup_unknown_objectJeff King, Jul 13, 2014
  23. Ramsay JonesJul 13, 2014
  24. Jeff KingJul 14, 2014
  25. Ramsay JonesJul 14, 2014
  26. Ramsay JonesJul 12, 2014
  27. Jeff KingJul 12, 2014
  28. 3/7 parse_object_buffer: do not set object typeJeff King, Jul 11, 2014
  29. 4/7 add object_as_type helper for casting objectsJeff King, Jul 11, 2014
  30. Ramsay JonesJul 11, 2014
  31. Jeff KingJul 11, 2014
  32. 5/7 alloc: factor out commit indexJeff King, Jul 11, 2014
  33. 6/7 object_as_type: set commit indexJeff King, Jul 11, 2014
  34. 7/7 diff-tree: avoid lookup_unknown_objectJeff King, Jul 11, 2014
  35. Ramsay JonesJul 11, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.