OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dwarves_fprintf: Set conf.cachelinep in union__fprintf() too 

union__fprintf() unconditionally uses conf.cachelinep, assuming there is
where the current cacheline is being kept, but if we call
union__fprintf() from something other than __class__fprintf(), then that
pointer is NULL, fix that.

Reported-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1633348
Fixes: e975ff247a ("dwarves_fprintf: Print cacheline boundaries in multiple union members")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2018-09-26 17:06:56 -03:00
parent bfdea37668
commit 70ef8c7f07
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dwarves_fprintf.c
View File

@ -828,6 +828,7 @@ static size_t union__fprintf(struct type *type, const struct cu *cu,
int indent = conf->indent;
struct conf_fprintf uconf;
uint32_t initial_union_cacheline;
int cacheline = 0; /* This will only be used if this is the outermost union */
if (indent >= (int)sizeof(tabs))
indent = sizeof(tabs) - 1;
@ -839,6 +840,17 @@ static size_t union__fprintf(struct type *type, const struct cu *cu,
uconf = *conf;
uconf.indent = indent + 1;
/*
* We may be called directly or from tag__fprintf, so keep sure
* we keep track of the cacheline we're in.
*
* If we're being called from an outer structure, i.e. union within
* struct, class or another union, then this will already have a
* value and we'll continue to use it.
*/
if (uconf.cachelinep == NULL)
uconf.cachelinep = &cacheline;
/*
* Save the cacheline we're in, then, after each union member, get
* back to it. Else we'll end up showing cacheline boundaries in