39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 8a87a4ee9107f250254d5c93c6fd62224c400ce7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
|
|
<ng.hong.quan@gmail.com>
|
|
Date: Mon, 14 Jul 2014 01:30:28 +0800
|
|
Subject: [PATCH 24/26] OpenPGP: Fix crash after accessing inexistent file.
|
|
|
|
---
|
|
src/libopensc/card-openpgp.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
Index: opensc-20150513/src/libopensc/card-openpgp.c
|
|
===================================================================
|
|
--- opensc-20150513.orig/src/libopensc/card-openpgp.c
|
|
+++ opensc-20150513/src/libopensc/card-openpgp.c
|
|
@@ -981,7 +981,6 @@ pgp_select_file(sc_card_t *card, const s
|
|
* So we set its size to be the same as max certificate size the card supports. */
|
|
(*ret)->size = priv->max_cert_size;
|
|
}
|
|
- priv->current = NULL;
|
|
LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
|
|
}
|
|
|
|
@@ -998,7 +997,6 @@ pgp_select_file(sc_card_t *card, const s
|
|
/* This file ID is referred when importing key&certificate via pkcs15init, like above.
|
|
* We pretend to successfully find this inexistent file. */
|
|
if (id == 0x4402 || id == 0x5f48) {
|
|
- priv->current = NULL;
|
|
if (ret == NULL)
|
|
/* No need to return file */
|
|
LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
|
|
@@ -1010,7 +1008,6 @@ pgp_select_file(sc_card_t *card, const s
|
|
}
|
|
|
|
if (r < 0) { /* failure */
|
|
- priv->current = NULL;
|
|
LOG_FUNC_RETURN(card->ctx, r);
|
|
}
|
|
}
|