ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util/id: fully allocate names table 

Trivial: this array should be allocated to have ID_MAX entries always.
Otherwise if someone were to forget to expand this table, the assertion
in the id generator won't actually trigger; it will read junk data.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
John Snow 2015-11-25 16:03:37 -05:00 committed by Michael Tokarev
parent 4c65fed8bd
commit 624533e5a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/id.c
View File

@ -29,7 +29,7 @@ bool id_wellformed(const char *id)
#define ID_SPECIAL_CHAR '#' #define ID_SPECIAL_CHAR '#'
static const char *const id_subsys_str[] = { static const char *const id_subsys_str[ID_MAX] = {
[ID_QDEV] = "qdev", [ID_QDEV] = "qdev",
[ID_BLOCK] = "block", [ID_BLOCK] = "block",
}; };
@ -53,7 +53,7 @@ char *id_generate(IdSubSystems id)
static uint64_t id_counters[ID_MAX]; static uint64_t id_counters[ID_MAX];
uint32_t rnd; uint32_t rnd;
assert(id < ID_MAX); assert(id < ARRAY_SIZE(id_subsys_str));
assert(id_subsys_str[id]); assert(id_subsys_str[id]);
rnd = g_random_int_range(0, 100); rnd = g_random_int_range(0, 100);