crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui-stats: cast pointer before checking for zero

Browse Source 
We abuse the "void *util" field as a counter and recently started to
cast it to a uintptr_t to avoid risking nasal demons by performing
arithmetic on a void pointer.

However, compilers are also known to do "interesting" things if they
know that a pointer is or isn't NULL.  Make this safer by checking if
the counter (after casting) is non-zero rather than checking if the
pointer is non-null.

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2016-02-08 14:12:35 +00:00 committed by Jason A. Donenfeld
parent a8b9ef8c1c
commit bdcbe0922d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-stats.c
View File

@ -184,9 +184,9 @@ static void add_commit(struct string_list *authors, struct commit *commit,
period->trunc(date); period->trunc(date);
tmp = xstrdup(period->pretty(date)); tmp = xstrdup(period->pretty(date));
item = string_list_insert(items, tmp); item = string_list_insert(items, tmp);
if (item->util)
free(tmp);
counter = (uintptr_t *)&item->util; counter = (uintptr_t *)&item->util;
if (*counter)
free(tmp);
(*counter)++; (*counter)++;
authorstat->total++; authorstat->total++;