From cc12a61001dca6f50b0497999318542a55947ef1 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Wed, 1 Apr 2015 20:00:39 +0200
Subject: [PATCH] catch non initialized pace context

---
 npa/src/npa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/npa/src/npa.c b/npa/src/npa.c
index 306eec7..4a406be 100644
--- a/npa/src/npa.c
+++ b/npa/src/npa.c
@@ -1256,7 +1256,8 @@ int perform_pace(sc_card_t *card,
         eac_ctx = EAC_CTX_new();
         if (!eac_ctx
                 || !EAC_CTX_init_ef_cardaccess(pace_output->ef_cardaccess,
-                    pace_output->ef_cardaccess_length, eac_ctx)) {
+                    pace_output->ef_cardaccess_length, eac_ctx)
+                || !eac_ctx->pace_ctx) {
             sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not parse EF.CardAccess.");
             ssl_error(card->ctx);
             r = SC_ERROR_INTERNAL;