diff options
| author | Alan Modra <amodra@gmail.com> | 2023-04-12 09:30:26 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-04-12 09:40:14 +0930 |
| commit | 32011d23a879283d845993e9358f64a6e8aefa98 (patch) | |
| tree | 90f08a84b2aa2eb9625efb614e913d10226611e8 | |
| parent | c10adfbb15a7e7d94f55cb012ed7c0ddef4156be (diff) | |
| download | gdb-32011d23a879283d845993e9358f64a6e8aefa98.zip gdb-32011d23a879283d845993e9358f64a6e8aefa98.tar.gz gdb-32011d23a879283d845993e9358f64a6e8aefa98.tar.bz2 | |
ubsan: dwarf2.c:2232:7: runtime error: index 16 out of bounds
Except it isn't out of bounds because space for a larger array has
been allocated.
* dwarf2.c (struct trie_leaf): Make ranges a C99 flexible array.
(alloc_trie_leaf, insert_arange_in_trie): Adjust sizing.
| -rw-r--r-- | bfd/dwarf2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index d99508a..b135ef0 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -137,7 +137,7 @@ struct trie_leaf struct { struct comp_unit *unit; bfd_vma low_pc, high_pc; - } ranges[TRIE_LEAF_SIZE]; + } ranges[]; }; struct trie_interior @@ -148,7 +148,9 @@ struct trie_interior static struct trie_node *alloc_trie_leaf (bfd *abfd) { - struct trie_leaf *leaf = bfd_zalloc (abfd, sizeof (struct trie_leaf)); + struct trie_leaf *leaf; + size_t amt = sizeof (*leaf) + TRIE_LEAF_SIZE * sizeof (leaf->ranges[0]); + leaf = bfd_zalloc (abfd, amt); if (leaf == NULL) return NULL; leaf->head.num_room_in_leaf = TRIE_LEAF_SIZE; @@ -2207,9 +2209,7 @@ insert_arange_in_trie (bfd *abfd, const struct trie_leaf *leaf = (struct trie_leaf *) trie; unsigned int new_room_in_leaf = trie->num_room_in_leaf * 2; struct trie_leaf *new_leaf; - size_t amt = (sizeof (struct trie_leaf) - + ((new_room_in_leaf - TRIE_LEAF_SIZE) - * sizeof (leaf->ranges[0]))); + size_t amt = sizeof (*leaf) + new_room_in_leaf * sizeof (leaf->ranges[0]); new_leaf = bfd_zalloc (abfd, amt); new_leaf->head.num_room_in_leaf = new_room_in_leaf; new_leaf->num_stored_in_leaf = leaf->num_stored_in_leaf; |