security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-11 22:52:47 +01:00
Code Activity

gpg: Fix portability problem.

Browse Source 
* g10/tofu.c (build_conflict_set): Replace variable dynamic array.
--

Note that clang complained that CONFLICT_SET_COUNT could be negative.
Thus I added an assert.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-12-08 13:06:10 +01:00
parent dec2ae31a4
commit c3008bffac
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/tofu.c
View File

@ -2227,9 +2227,15 @@ build_conflict_set (tofu_dbs_t dbs,
int j; int j;
strlist_t *prevp; strlist_t *prevp;
strlist_t iter_next; strlist_t iter_next;
int die[conflict_set_count]; int *die;
memset (die, 0, sizeof (die)); log_assert (conflict_set_count > 0);
die = xtrycalloc (1, conflict_set_count);
if (!die)
{
/*err = gpg_error_from_syserror ();*/
xoutofcore (); /* Fixme: Let the fucntion return an error. */
}
for (i = 0; i < conflict_set_count; i ++) for (i = 0; i < conflict_set_count; i ++)
{ {
@ -2269,6 +2275,7 @@ build_conflict_set (tofu_dbs_t dbs,
/* We shouldn't have removed the head. */ /* We shouldn't have removed the head. */
log_assert (conflict_set); log_assert (conflict_set);
log_assert (conflict_set_count >= 1); log_assert (conflict_set_count >= 1);
xfree (die);
} }
xfree (kb_all); xfree (kb_all);