Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/softoken/sftkpars.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 34 matching lines @@
 #include "prenv.h"
 
 /*
  * this file contains routines for parsing PKCS #11 module spec
  * strings.
  */
 
 #define SFTK_HANDLE_STRING_ARG(param,target,value,command) \
     if (PORT_Strncasecmp(param,value,sizeof(value)-1) == 0) { \
         param += sizeof(value)-1; \
+        if (target) \
+            PORT_Free(target); \
         target = sftk_argFetchValue(param,&next); \
         param += next; \
         command ;\
     } else  
 
 #define SFTK_HANDLE_FINAL_ARG(param) \
     { param = sftk_argSkipParameter(param); } param = sftk_argStrip(param);
 
 static PRBool sftk_argGetPair(char c) {
     switch (c) {
@@ skipping 266 matching lines @@
     parsed->forceOpen = sftk_argHasFlag("flags","forceOpen",tmp);
     parsed->pwRequired = sftk_argHasFlag("flags","passwordRequired",tmp);
     parsed->optimizeSpace = sftk_argHasFlag("flags","optimizeSpace",tmp);
     return;
 }
 
 static CK_RV
 sftk_parseTokenParameters(char *param, sftk_token_parameters *parsed) 
 {
     int next;
-    char *tmp;
+    char *tmp = NULL;
     char *index;
     index = sftk_argStrip(param);
 
     while (*index) {
         SFTK_HANDLE_STRING_ARG(index,parsed->configdir,"configDir=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->updatedir,"updateDir=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->updCertPrefix,"updateCertPrefix=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->updKeyPrefix,"updateKeyPrefix=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->updateID,"updateID=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->certPrefix,"certPrefix=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->keyPrefix,"keyPrefix=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->tokdes,"tokenDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->updtokdes,
                                                 "updateTokenDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,parsed->slotdes,"slotDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,tmp,"minPWLen=", 
-                        if(tmp) { parsed->minPW=atoi(tmp); PORT_Free(tmp); })
+           if(tmp) { parsed->minPW=atoi(tmp); PORT_Free(tmp); tmp = NULL; })
         SFTK_HANDLE_STRING_ARG(index,tmp,"flags=", 
-           if(tmp) { sftk_parseTokenFlags(param,parsed); PORT_Free(tmp); })
+           if(tmp) { sftk_parseTokenFlags(param,parsed); PORT_Free(tmp); tmp = NULL; })
         SFTK_HANDLE_FINAL_ARG(index)
    }
    return CKR_OK;
 }
 
 static void
 sftk_parseTokens(char *tokenParams, sftk_parameters *parsed)
 {
     char *tokenIndex;
     sftk_token_parameters *tokens = NULL;
@@ skipping 35 matching lines @@
     }
     parsed->token_count = i;
     parsed->tokens = tokens;
     return; 
 }
 
 CK_RV
 sftk_parseParameters(char *param, sftk_parameters *parsed, PRBool isFIPS) 
 {
     int next;
-    char *tmp;
+    char *tmp = NULL;
     char *index;
     char *certPrefix = NULL, *keyPrefix = NULL;
     char *tokdes = NULL, *ptokdes = NULL, *pupdtokdes = NULL;
     char *slotdes = NULL, *pslotdes = NULL;
     char *fslotdes = NULL, *ftokdes = NULL;
     char *minPW = NULL;
     index = sftk_argStrip(param);
 
     PORT_Memset(parsed, 0, sizeof(sftk_parameters));
 
@@ skipping 10 matching lines @@
         SFTK_HANDLE_STRING_ARG(index,tokdes,"cryptoTokenDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,ptokdes,"dbTokenDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,slotdes,"cryptoSlotDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,pslotdes,"dbSlotDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,fslotdes,"FIPSSlotDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,ftokdes,"FIPSTokenDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,pupdtokdes, "updateTokenDescription=",;)
         SFTK_HANDLE_STRING_ARG(index,minPW,"minPWLen=",;)
 
         SFTK_HANDLE_STRING_ARG(index,tmp,"flags=", 
-                if(tmp) { sftk_parseFlags(param,parsed); PORT_Free(tmp); })
+                if(tmp) { sftk_parseFlags(param,parsed); PORT_Free(tmp); tmp = NULL; })
         SFTK_HANDLE_STRING_ARG(index,tmp,"tokens=", 
-                if(tmp) { sftk_parseTokens(tmp,parsed); PORT_Free(tmp); })
+                if(tmp) { sftk_parseTokens(tmp,parsed); PORT_Free(tmp); tmp = NULL; })
         SFTK_HANDLE_FINAL_ARG(index)
     }
     if (parsed->tokens == NULL) {
         int  count = isFIPS ? 1 : 2;
         int  index = count-1;
         sftk_token_parameters *tokens = NULL;
 
         tokens = (sftk_token_parameters *) 
                         PORT_ZAlloc(count*sizeof(sftk_token_parameters));
         if (tokens == NULL) {
@@ skipping 179 matching lines @@
    }
 
    if (lconfigdir) {
         value = PR_smprintf("%s" PATH_SEPARATOR "%s",lconfigdir,secmodName);
    } else {
         value = PR_smprintf("%s",secmodName);
    }
    if (configdir) PORT_Free(configdir);
    return value;
 }