Do not bypass initialization if module arguments are omitted.

501058

1 files changed, 3 insertions, 6 deletions

diff --git a/pinst.c b/pinst.c
index 17ffff0..0a80803 100644
--- a/pinst.c
+++ b/pinst.c
@@ -415,14 +415,11 @@ pem_Initialize
 
     CK_C_INITIALIZE_ARGS_PTR modArgs =
         NSSCKFWInstance_GetInitArgs(fwInstance);
-    if (!modArgs) {
+    if (!modArgs || !modArgs->LibraryParameters) {
         goto done;
     }
-    if (modArgs->LibraryParameters) {
-        modparms = (unsigned char *) modArgs->LibraryParameters;
-    }
-    if (modparms)
-        plog("Initialized with %s\n", modparms);
+    modparms = (unsigned char *) modArgs->LibraryParameters;
+    plog("Initialized with %s\n", modparms);
 
     /*
      * The initialization string format is a space-delimited file of