From 2b6964643f31bd85b02e62b6d1900375413d9f2c Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Tue, 24 Mar 2015 08:25:47 +0100
Subject: [PATCH] fixed handling scconf_block

---
 npa/src/card-npa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npa/src/card-npa.c b/npa/src/card-npa.c
index 525cb34..04d31ad 100644
--- a/npa/src/card-npa.c
+++ b/npa/src/card-npa.c
@@ -90,12 +90,12 @@ static int npa_load_options(sc_context_t *ctx, struct npa_drv_data *drv_data)
     scconf_block **found_blocks, *block;
     const char *file;
 
-    if (!ctx || !drv_data) {
+    if (!ctx || !drv_data || !ctx->conf_blocks) {
         r = SC_ERROR_INTERNAL;
         goto err;
     }
 
-    for (i = 0; ctx->conf_blocks; i++) {
+    for (i = 0; ctx->conf_blocks[i]; i++) {
         found_blocks = scconf_find_blocks(ctx->conf, ctx->conf_blocks[i],
                     "card_driver", "npa");
         if (!found_blocks)