Uprev NSS to 3.18 RTM

nss/lib/pk11wrap/pk11util.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*
  * Initialize the PCKS 11 subsystem
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "nssilock.h"
 #include "secmodi.h"
@@ skipping 1167 matching lines @@
 
 /*
  * This function "wakes up" WaitForAnyTokenEvent. It's a pretty drastic
  * function, possibly bringing down the pkcs #11 module in question. This
  * should be OK because 1) it does reinitialize, and 2) it should only be
  * called when we are on our way to tear the whole system down anyway.
  */
 SECStatus
 SECMOD_CancelWait(SECMODModule *mod)
 {
-    unsigned long controlMask = mod->evControlMask;
+    unsigned long controlMask;
     SECStatus rv = SECSuccess;
     CK_RV crv;
 
     PZ_Lock(mod->refLock);
     mod->evControlMask |= SECMOD_END_WAIT;
     controlMask = mod->evControlMask;
     if (controlMask & SECMOD_WAIT_PKCS11_EVENT) {
         if (!pk11_getFinalizeModulesOption()) {
             /* can't get here unless pk11_getFinalizeModulesOption is set */
             PORT_Assert(0);
@@ skipping 377 matching lines @@
      * on multiple failures, we are only returning the lastError. The caller
      * can determine which slots are bad by calling PK11_IsDisabled().
      */
     if (rrv != SECSuccess) {
         /* restore the last error code */
         PORT_SetError(lastError);
     }
 
     return rrv;
 }