security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

wkd: Properly unescape the user-id from a key listing.

Browse Source 
* tools/wks-util.c (append_to_uidinfo_list): Unescape UID.
This commit is contained in:
Werner Koch 2021-08-20 16:15:49 +02:00
parent b4345f7521
commit 87d238de3d
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/wks-util.c
View File

@ -98,19 +98,28 @@ wks_write_status (int no, const char *format, ...)
/* Append UID to LIST and return the new item. On success LIST is /* Append UID to LIST and return the new item. On success LIST is
* updated. On error ERRNO is set and NULL returned. */ * updated. C-style escaping is removed from UID. On error ERRNO is
* set and NULL returned. */
static uidinfo_list_t static uidinfo_list_t
append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created) append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created)
{ {
uidinfo_list_t r, sl; uidinfo_list_t r, sl;
char *plainuid;
sl = xtrymalloc (sizeof *sl + strlen (uid)); plainuid = decode_c_string (uid);
if (!sl) if (!plainuid)
return NULL; return NULL;
strcpy (sl->uid, uid); sl = xtrymalloc (sizeof *sl + strlen (plainuid));
if (!sl)
{
xfree (plainuid);
return NULL;
}
strcpy (sl->uid, plainuid);
sl->created = created; sl->created = created;
sl->mbox = mailbox_from_userid (uid, 0); sl->mbox = mailbox_from_userid (plainuid, 0);
sl->next = NULL; sl->next = NULL;
if (!*list) if (!*list)
*list = sl; *list = sl;
@ -120,6 +129,8 @@ append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created)
; ;
r->next = sl; r->next = sl;
} }
xfree (plainuid);
return sl; return sl;
} }
@ -395,7 +406,6 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
} }
else if (!strcmp (fields[0], "uid") && nfields > 9) else if (!strcmp (fields[0], "uid") && nfields > 9)
{ {
/* Fixme: Unescape fields[9] */
if (!append_to_uidinfo_list (&mboxes, fields[9], if (!append_to_uidinfo_list (&mboxes, fields[9],
parse_timestamp (fields[5], NULL))) parse_timestamp (fields[5], NULL)))
{ {