mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
gpg: Remove useless condition.
* g10/keylist.c (list_keyblock_colon): Remove useless condition (PK). (list_keyblock_print): Likewise. -- PK is already derefed above and thus testing for PK is dead code. Detected by Stack 0.3: bug: anti-simplify model: | %tobool200 = icmp ne %struct.PKT_public_key* %3, null, !dbg !1498 --> true stack: - /home/wk/s/gnupg/g10/keylist.c:1367:0 ncore: 1 core: - /home/wk/s/gnupg/g10/keylist.c:1319:0 - null pointer dereference bug: anti-simplify model: | %tobool102 = icmp ne %struct.PKT_public_key* %4, null, !dbg !1462 --> true stack: - /home/wk/s/gnupg/g10/keylist.c:978:0 ncore: 1 core: - /home/wk/s/gnupg/g10/keylist.c:955:0 - null pointer dereference bug: anti-simplify model: | %tobool128 = icmp ne %struct.PKT_public_key* %4, null, !dbg !1469 --> true stack: - /home/wk/s/gnupg/g10/keylist.c:990:0 ncore: 1 core: - /home/wk/s/gnupg/g10/keylist.c:955:0 - null pointer dereference
This commit is contained in:
parent
ef0a3abf73
commit
c59b410cf1
@ -975,7 +975,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr, void *opaque)
|
|||||||
{
|
{
|
||||||
PKT_user_id *uid = node->pkt->pkt.user_id;
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
||||||
|
|
||||||
if (pk && (uid->is_expired || uid->is_revoked)
|
if ((uid->is_expired || uid->is_revoked)
|
||||||
&& !(opt.list_options & LIST_SHOW_UNUSABLE_UIDS))
|
&& !(opt.list_options & LIST_SHOW_UNUSABLE_UIDS))
|
||||||
{
|
{
|
||||||
skip_sigs = 1;
|
skip_sigs = 1;
|
||||||
@ -988,7 +988,7 @@ list_keyblock_print (KBNODE keyblock, int secret, int fpr, void *opaque)
|
|||||||
dump_attribs (uid, pk);
|
dump_attribs (uid, pk);
|
||||||
|
|
||||||
if ((uid->is_revoked || uid->is_expired)
|
if ((uid->is_revoked || uid->is_expired)
|
||||||
|| ((opt.list_options & LIST_SHOW_UID_VALIDITY) && pk))
|
|| (opt.list_options & LIST_SHOW_UID_VALIDITY))
|
||||||
{
|
{
|
||||||
const char *validity;
|
const char *validity;
|
||||||
int indent;
|
int indent;
|
||||||
@ -1364,7 +1364,7 @@ list_keyblock_colon (KBNODE keyblock, int secret, int has_secret, int fpr)
|
|||||||
{
|
{
|
||||||
int uid_validity;
|
int uid_validity;
|
||||||
|
|
||||||
if (pk && !ulti_hack)
|
if (!ulti_hack)
|
||||||
uid_validity = get_validity_info (pk, uid);
|
uid_validity = get_validity_info (pk, uid);
|
||||||
else
|
else
|
||||||
uid_validity = 'u';
|
uid_validity = 'u';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user