diff options
Diffstat (limited to 'oidtree.c')
| -rw-r--r-- | oidtree.c | 29 |
1 files changed, 17 insertions, 12 deletions
@@ -6,11 +6,6 @@ #include "alloc.h" #include "hash.h" -struct oidtree_node { - /* n.k[] is used to store "struct object_id" */ - struct cb_node n; -}; - struct oidtree_iter_data { oidtree_iter fn; void *arg; @@ -35,13 +30,20 @@ void oidtree_clear(struct oidtree *ot) void oidtree_insert(struct oidtree *ot, const struct object_id *oid) { - struct oidtree_node *on; + struct cb_node *on; + struct object_id k; if (!oid->algo) BUG("oidtree_insert requires oid->algo"); on = mem_pool_alloc(&ot->mem_pool, sizeof(*on) + sizeof(*oid)); - oidcpy_with_padding((struct object_id *)on->n.k, oid); + + /* + * Clear the padding and copy the result in separate steps to + * respect the 4-byte alignment needed by struct object_id. + */ + oidcpy_with_padding(&k, oid); + memcpy(on->k, &k, sizeof(k)); /* * n.b. Current callers won't get us duplicates, here. If a @@ -49,7 +51,7 @@ void oidtree_insert(struct oidtree *ot, const struct object_id *oid) * that won't be freed until oidtree_clear. Currently it's not * worth maintaining a free list */ - cb_insert(&ot->tree, &on->n, sizeof(*oid)); + cb_insert(&ot->tree, on, sizeof(*oid)); } @@ -73,17 +75,20 @@ int oidtree_contains(struct oidtree *ot, const struct object_id *oid) static enum cb_next iter(struct cb_node *n, void *arg) { struct oidtree_iter_data *x = arg; - const struct object_id *oid = (const struct object_id *)n->k; + struct object_id k; + + /* Copy to provide 4-byte alignment needed by struct object_id. */ + memcpy(&k, n->k, sizeof(k)); - if (x->algo != GIT_HASH_UNKNOWN && x->algo != oid->algo) + if (x->algo != GIT_HASH_UNKNOWN && x->algo != k.algo) return CB_CONTINUE; if (x->last_nibble_at) { - if ((oid->hash[*x->last_nibble_at] ^ x->last_byte) & 0xf0) + if ((k.hash[*x->last_nibble_at] ^ x->last_byte) & 0xf0) return CB_CONTINUE; } - return x->fn(oid, x->arg); + return x->fn(&k, x->arg); } void oidtree_each(struct oidtree *ot, const struct object_id *oid, |