git.librecmc.org Git - librecmc/librecmc-fossil.git/blob

   1 From 8a87a4ee9107f250254d5c93c6fd62224c400ce7 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
   3  <ng.hong.quan@gmail.com>
   4 Date: Mon, 14 Jul 2014 01:30:28 +0800
   5 Subject: [PATCH 24/26] OpenPGP: Fix crash after accessing inexistent file.
   6
   7 ---
   8  src/libopensc/card-openpgp.c | 3 ---
   9  1 file changed, 3 deletions(-)
  10
  11 diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
  12 index ca3173c..94c69ae 100644
  13 --- a/src/libopensc/card-openpgp.c
  14 +++ b/src/libopensc/card-openpgp.c
  15 @@ -973,7 +973,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
  16                          * So we set its size to be the same as max certificate size the card supports. */
  17                         (*ret)->size = priv->max_cert_size;
  18                 }
  19 -               priv->current = NULL;
  20                 LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
  21         }
  22
  23 @@ -990,7 +989,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
  24                 /* This file ID is refered when importing key&certificate via pkcs15init, like above.
  25                  * We pretend to successfully find this inexistent file. */
  26                 if (id == 0x4402 || id == 0x5f48) {
  27 -                       priv->current = NULL;
  28                         if (ret == NULL)
  29                                 /* No need to return file */
  30                                 LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
  31 @@ -1002,7 +1000,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
  32                 }
  33
  34                 if (r < 0) {    /* failure */
  35 -                       priv->current = NULL;
  36                         LOG_FUNC_RETURN(card->ctx, r);
  37                 }
  38         }
  39 --
  40 2.1.3
  41