diff options
| author | Werner Koch <[email protected]> | 2020-11-02 16:23:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-11-02 16:34:29 +0000 |
| commit | e1bafa3574ccd56d9f8f8c1deb3d8fb9fd7025cc (patch) | |
| tree | ea99746f2866c52a3a0173238eef57bbda5e89ee /g10/misc.c | |
| parent | build: Remove m4 macro defs which are not anymore used. (diff) | |
| download | gnupg-e1bafa3574ccd56d9f8f8c1deb3d8fb9fd7025cc.tar.gz gnupg-e1bafa3574ccd56d9f8f8c1deb3d8fb9fd7025cc.zip | |
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 \[email protected]
GnuPG-bug-id: 5117
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/misc.c')
| -rw-r--r-- | g10/misc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/g10/misc.c b/g10/misc.c index c7107be06..a606d5364 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -922,6 +922,11 @@ pct_expando (ctrl_t ctrl, const char *string,struct expando_args *args) u32 pk_keyid[2]={0,0},sk_keyid[2]={0,0}; 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) keyid_from_pk(args->pk,pk_keyid); |