From e1bafa3574ccd56d9f8f8c1deb3d8fb9fd7025cc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 2 Nov 2020 17:23:53 +0100 Subject: gpg: Allow setting notations with the empty string as value. * 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 --- g10/photoid.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'g10/photoid.c') diff --git a/g10/photoid.c b/g10/photoid.c index 8a4436b8b..592d5e484 100644 --- a/g10/photoid.c +++ b/g10/photoid.c @@ -670,6 +670,11 @@ show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count, command = pct_expando (ctrl, opt.photo_viewer,&args); if(!command) goto fail; + if (!*command) + { + xfree (command); + goto fail; + } name = xmalloc (1 + 16 + strlen(EXTSEP_S) + strlen (image_type_to_string (args.imagetype, 0))); -- cgit v1.2.3