security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

Fix usage of realloc.

This commit is contained in:
Werner Koch 2009-12-02 19:00:10 +00:00
parent 9e83404751
commit edd95da365
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/ChangeLog
View File

@ -1,3 +1,10 @@
2009-12-02 Werner Koch <wk@g10code.com>
* trustlist.c (read_trustfiles): Store the pointer returned from
shrinking the memory and not the orginal one. Fixes bug#1163.
Reported by TAKAHASHI Tamotsu. Also return correct error after
memory failure.
2009-11-27 Marcus Brinkmann <marcus@g10code.de> 2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call * command.c (start_command_handler): Do not call

3
agent/trustlist.c
View File

@ -361,13 +361,14 @@ read_trustfiles (void)
ti = xtryrealloc (table, (tableidx?tableidx:1) * sizeof *table); ti = xtryrealloc (table, (tableidx?tableidx:1) * sizeof *table);
if (!ti) if (!ti)
{ {
err = gpg_error_from_syserror ();
xfree (table); xfree (table);
return err; return err;
} }
lock_trusttable (); lock_trusttable ();
xfree (trusttable); xfree (trusttable);
trusttable = table; trusttable = ti;
trusttablesize = tableidx; trusttablesize = tableidx;
unlock_trusttable (); unlock_trusttable ();
return 0; return 0;