From 777019faf0b8f10a897c3ee477d35f9b29f02224 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 20 Nov 2020 15:35:27 +0900 Subject: gpg: Change API of agent_scd_serialno. * g10/call-agent.c (agent_scd_serialno): Extend API to allow with R_SERIALNO == NULL. * g10/card-util.c (card_status): Use NULL for agent_scd_serialno. (factory_reset): Likewise. * g10/skclist.c (build_sk_list): Likewise. Signed-off-by: NIIBE Yutaka --- g10/call-agent.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'g10/call-agent.c') diff --git a/g10/call-agent.c b/g10/call-agent.c index cc0da316b..9a3b43d9e 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -1408,7 +1408,9 @@ agent_scd_serialno (char **r_serialno, const char *demand) char *serialno = NULL; char line[ASSUAN_LINELENGTH]; - *r_serialno = NULL; + if (r_serialno) + *r_serialno = NULL; + err = start_agent (NULL, (1 | FLAG_FOR_CARD_SUPPRESS_ERRORS)); if (err) return err; @@ -1427,7 +1429,11 @@ agent_scd_serialno (char **r_serialno, const char *demand) return err; } - *r_serialno = serialno; + if (r_serialno) + *r_serialno = serialno; + else + xfree (serialno); + return 0; } -- cgit v1.2.3