security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-20 14:37:08 +01:00
Code Activity

Fix bug#1138.

Browse Source
This commit is contained in:
Werner Koch 2009-09-28 17:11:32 +00:00
parent 999f8a3feb
commit 378b313f58
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2009-09-28 Werner Koch <wk@g10code.com>
* trustdb.c (get_validity_info): Take care of a NULL PK. Fixes
bug#1138.
(get_validity_string): Ditto.
2009-09-02 Werner Koch <wk@g10code.com> 2009-09-02 Werner Koch <wk@g10code.com>
* app-openpgp.c (do_decipher): Compute required Le. * app-openpgp.c (do_decipher): Compute required Le.

6
g10/photoid.c
View File

@ -194,7 +194,8 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
} }
/* Returns 0 for error, 1 for valid */ /* Returns 0 for error, 1 for valid */
int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len) int
parse_image_header(const struct user_attribute *attr,byte *type,u32 *len)
{ {
u16 headerlen; u16 headerlen;
@ -229,7 +230,8 @@ int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len)
make sure it is not too big (see parse-packet.c:parse_attribute). make sure it is not too big (see parse-packet.c:parse_attribute).
Extensions should be 3 characters long for the best cross-platform Extensions should be 3 characters long for the best cross-platform
compatibility. */ compatibility. */
char *image_type_to_string(byte type,int style) char *
image_type_to_string(byte type,int style)
{ {
char *string; char *string;

6
g10/trustdb.c
View File

@ -1182,6 +1182,9 @@ get_validity_info (PKT_public_key *pk, PKT_user_id *uid)
{ {
int trustlevel; int trustlevel;
if (!pk)
return '?'; /* Just in case a NULL PK is passed. */
trustlevel = get_validity (pk, uid); trustlevel = get_validity (pk, uid);
if( trustlevel & TRUST_FLAG_REVOKED ) if( trustlevel & TRUST_FLAG_REVOKED )
return 'r'; return 'r';
@ -1193,6 +1196,9 @@ get_validity_string (PKT_public_key *pk, PKT_user_id *uid)
{ {
int trustlevel; int trustlevel;
if (!pk)
return "err"; /* Just in case a NULL PK is passed. */
trustlevel = get_validity (pk, uid); trustlevel = get_validity (pk, uid);
if( trustlevel & TRUST_FLAG_REVOKED ) if( trustlevel & TRUST_FLAG_REVOKED )
return _("revoked"); return _("revoked");