From 2e1b47a79a3604a3a549b92326d724538dabcf14 Mon Sep 17 00:00:00 2001 From: Peter Marschall Date: Sat, 16 Jun 2018 19:34:39 +0200 Subject: [PATCH] OpenPGP: improve get_full_pgp_aid()'s parameter checking --- src/libopensc/card-openpgp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c index 82cc05e4..aa0efacb 100644 --- a/src/libopensc/card-openpgp.c +++ b/src/libopensc/card-openpgp.c @@ -364,10 +364,13 @@ struct pgp_priv_data { static int get_full_pgp_aid(sc_card_t *card, sc_file_t *file) { - int r = 0; - /* explicitly get the full aid */ - r = sc_get_data(card, 0x004F, file->name, sizeof file->name); - file->namelen = MAX(r, 0); + int r = SC_ERROR_INVALID_ARGUMENTS; + + if (file != NULL) { + /* explicitly get the full aid */ + r = sc_get_data(card, 0x004F, file->name, sizeof file->name); + file->namelen = MAX(r, 0); + } return r; }