mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Avoid warnings about possible NULL deref.
* g10/getkey.c (cache_public_key): Protect deref of CE which actually can't happen. * g10/keygen.c (quickgen_set_para): s/sprintf/snprintf/. * g10/tofu.c (end_transaction, rollback_transaction): Allow NULL for DB. * g10/trustdb.c (update_min_ownertrust): Remove useless clearling of ERR. -- Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
008aa6e6d4
commit
8a56a38387
4 changed files with 8 additions and 3 deletions
|
@ -306,6 +306,9 @@ end_transaction (struct db *db, int only_batch)
|
|||
int rc;
|
||||
char *err = NULL;
|
||||
|
||||
if (!db)
|
||||
return 0; /* Shortcut to allow for easier cleanup code. */
|
||||
|
||||
if ((! batch_update || only_batch == 2) && db->batch_update)
|
||||
/* The batch transaction is still in open, but we left batch
|
||||
mode. */
|
||||
|
@ -353,6 +356,9 @@ rollback_transaction (struct db *db)
|
|||
int rc;
|
||||
char *err = NULL;
|
||||
|
||||
if (!db)
|
||||
return 0; /* Shortcut to allow for easier cleanup code. */
|
||||
|
||||
if (db->batch_update)
|
||||
/* Just undo the most recent update; don't revert any progress
|
||||
made by the batch transaction. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue