Index: nss/mozilla/security/nss/lib/nss/nssinit.c |
=================================================================== |
--- nss/mozilla/security/nss/lib/nss/nssinit.c (revision 55475) |
+++ nss/mozilla/security/nss/lib/nss/nssinit.c (working copy) |
@@ -36,7 +36,7 @@ |
* the terms of any one of the MPL, the GPL or the LGPL. |
* |
* ***** END LICENSE BLOCK ***** */ |
-/* $Id: nssinit.c,v 1.105 2010/01/22 02:10:54 wtc%google.com Exp $ */ |
+/* $Id: nssinit.c,v 1.106 2010/04/03 20:06:00 nelson%bolyard.com Exp $ */ |
#include <ctype.h> |
#include <string.h> |
@@ -585,7 +585,7 @@ |
if (initContextPtr) { |
*initContextPtr = PORT_ZNew(NSSInitContext); |
if (*initContextPtr == NULL) { |
- return SECFailure; |
+ goto loser; |
} |
/* |
* For traditional NSS_Init, we used the PK11_Configure() call to set |
@@ -597,7 +597,7 @@ |
if (initParams) { |
if (initParams->length < sizeof(NSSInitParameters)) { |
PORT_SetError(SEC_ERROR_INVALID_ARGS); |
- return SECFailure; |
+ goto loser; |
} |
configStrings = nss_MkConfigString(initParams->manufactureID, |
initParams->libraryDescription, |
@@ -610,7 +610,7 @@ |
initParams->minPWLen); |
if (configStrings == NULL) { |
PORT_SetError(SEC_ERROR_NO_MEMORY); |
- return SECFailure; |
+ goto loser; |
} |
configName = initParams->libraryDescription; |
passwordRequired = initParams->passwordRequired; |