From: Pankaj <pankaj.s01@samsung.com>
Date: Tue, 5 Jan 2016 09:52:00 +0000 (+0000)
Subject: Avoiding redundant check
X-Git-Tag: 0.23.3~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c4ef3f492d88acca931174519b7aa1215cc1a18;p=p11-kit

Avoiding redundant check

https://bugs.freedesktop.org/show_bug.cgi?id=93587
---

diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index acb3707..63baeb1 100644
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -2326,17 +2326,15 @@ p11_module_load_inlock_reentrant (CK_FUNCTION_LIST *module,
 		}
 
 		/* If this was newly allocated, add it to the list */
-		if (rv == CKR_OK && allocated) {
+		if (allocated) {
 			if (!p11_dict_set (gl.modules, allocated, allocated) ||
 			    !p11_dict_set (gl.unmanaged_by_funcs, module, allocated))
 				return_val_if_reached (CKR_HOST_MEMORY);
 			allocated = NULL;
 		}
 
-		if (rv == CKR_OK) {
 			/* WARNING: Reentrancy can occur here */
 			rv = prepare_module_inlock_reentrant (mod, flags, result);
-		}
 
 		free (allocated);
 	}