Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: nss/mozilla/security/nss/lib/nss/nssinit.c

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698