aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-06-02 22:19:39 +0000
committerDavid Shaw <[email protected]>2002-06-02 22:19:39 +0000
commite96f8f1fe062a0ad3a8696c7f6ef8055ac9b57a6 (patch)
tree0972ed2210d8caf0c56f90e0239c4f151e6caa17
parent* sign.c (mk_notation_and_policy): Free unneeded buffer. (diff)
downloadgnupg-e96f8f1fe062a0ad3a8696c7f6ef8055ac9b57a6.tar.gz
gnupg-e96f8f1fe062a0ad3a8696c7f6ef8055ac9b57a6.zip
* photoid.c (show_photos): Work properly when not called with a public
key.
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/photoid.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7923b8178..14cca8154 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-02 David Shaw <[email protected]>
+
+ * photoid.c (show_photos): Work properly when not called with a
+ public key.
+
2002-05-31 David Shaw <[email protected]>
* sign.c (mk_notation_and_policy): Free unneeded buffer.
diff --git a/g10/photoid.c b/g10/photoid.c
index d696c761c..65a0243f1 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -220,12 +220,13 @@ void show_photos(const struct user_attribute *attrs,
int i;
struct expando_args args;
u32 len;
- u32 kid[2];
+ u32 kid[2]={0,0};
memset(&args,0,sizeof(args));
args.pk=pk;
- keyid_from_pk(pk,kid);
+ if(pk)
+ keyid_from_pk(pk,kid);
for(i=0;i<count;i++)
if(attrs[i].type==ATTRIB_IMAGE &&