Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/ckfw/object.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/. */
 
 /*
  * object.c
  *
  * This file implements the NSSCKFWObject type and methods.
  */
 
@@ skipping 153 matching lines @@
 
   fwObject->fwToken = fwToken;
   fwObject->mdToken = nssCKFWToken_GetMDToken(fwToken);
   fwObject->fwInstance = fwInstance;
   fwObject->mdInstance = nssCKFWInstance_GetMDInstance(fwInstance);
   fwObject->mutex = nssCKFWInstance_CreateMutex(fwInstance, arena, pError);
   if (!fwObject->mutex) {
     if( CKR_OK == *pError ) {
       *pError = CKR_GENERAL_ERROR;
     }
+    nss_ZFreeIf(fwObject);
     return (NSSCKFWObject *)NULL;
   }
 
   *pError = nssCKFWHash_Add(mdObjectHash, mdObject, fwObject);
   if( CKR_OK != *pError ) {
     nss_ZFreeIf(fwObject);
     return (NSSCKFWObject *)NULL;
   }
 
 #ifdef DEBUG
@@ skipping 830 matching lines @@
   }
 
   *pError = nssCKFWObject_verifyPointer(fwObject);
   if( CKR_OK != *pError ) {
     return (CK_ULONG)0;
   }
 #endif /* DEBUG */
 
   return nssCKFWObject_GetObjectSize(fwObject, pError);
 }