Blame opensc-dlclose.patch
|
Nikos Mavrogiannopoulos |
b79ccf8 |
From 6d02503e19680a9f3f4e556e4cd99b1c2bbf6d1a Mon Sep 17 00:00:00 2001
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
Date: Fri, 28 Feb 2014 16:17:37 +0100
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
Subject: [PATCH] Call dlclose() only when having a valid handle.
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
---
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
src/common/libpkcs11.c | 2 +-
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
diff --git a/src/common/libpkcs11.c b/src/common/libpkcs11.c
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
index f8c70a7..b22d16d 100644
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
--- a/src/common/libpkcs11.c
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
+++ b/src/common/libpkcs11.c
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
@@ -74,7 +74,7 @@ C_UnloadModule(void *module)
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
if (!mod || mod->_magic != MAGIC)
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
return CKR_ARGUMENTS_BAD;
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
- if (sc_dlclose(mod->handle) < 0)
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
+ if (mod->handle != NULL && sc_dlclose(mod->handle) < 0)
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
return CKR_FUNCTION_FAILED;
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
memset(mod, 0, sizeof(*mod));
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
--
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
1.8.5.3
|
|
Nikos Mavrogiannopoulos |
b79ccf8 |
|