security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

gpg: Allow setting notations with the empty string as value.

Browse Source 
* g10/misc.c (pct_expando): Catch special case of the empty string.
Also map a NULL to the empty string.
* g10/photoid.c (show_photos): Make an empty string used as command
fail.
--

This patch also fixes a segv when calling gpg wrongly like

  gpg -N \-foo@example.org

GnuPG-bug-id: 5117
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-11-02 17:23:53 +01:00
parent 4c181d51a6
commit f007d79533
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/misc.c
View File

@ -917,6 +917,11 @@ pct_expando(const char *string,struct expando_args *args)
u32 pk_keyid[2]={0,0},sk_keyid[2]={0,0}; u32 pk_keyid[2]={0,0},sk_keyid[2]={0,0};
char *ret=NULL; char *ret=NULL;
/* The parser below would return NULL for an empty string, thus we
* catch it here. Also catch NULL here. */
if (!string || !*string)
return xstrdup ("");
if(args->pk) if(args->pk)
keyid_from_pk(args->pk,pk_keyid); keyid_from_pk(args->pk,pk_keyid);

5
g10/photoid.c
View File

@ -341,6 +341,11 @@ show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count,
command=pct_expando(opt.photo_viewer,&args); command=pct_expando(opt.photo_viewer,&args);
if(!command) if(!command)
goto fail; goto fail;
if (!*command)
{
xfree (command);
goto fail;
}
name=xmalloc(16+strlen(EXTSEP_S)+ name=xmalloc(16+strlen(EXTSEP_S)+
strlen(image_type_to_string(args.imagetype,0))+1); strlen(image_type_to_string(args.imagetype,0))+1);