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

Side by Side Diff: nss/lib/util/utilmod.c

Issue 70673004: Update to NSS 3.15.3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Update to NSS 3.15.3 Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* 4 /*
5 * The following code handles the storage of PKCS 11 modules used by the 5 * The following code handles the storage of PKCS 11 modules used by the
6 * NSS. For the rest of NSS, only one kind of database handle exists: 6 * NSS. For the rest of NSS, only one kind of database handle exists:
7 * 7 *
8 * SFTKDBHandle 8 * SFTKDBHandle
9 * 9 *
10 * There is one SFTKDBHandle for each key database and one for each cert 10 * There is one SFTKDBHandle for each key database and one for each cert
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 351
352 /* couldn't get the old name */ 352 /* couldn't get the old name */
353 if (!olddbname) { 353 if (!olddbname) {
354 goto bail; 354 goto bail;
355 } 355 }
356 356
357 /* old one exists */ 357 /* old one exists */
358 status = PR_Access(olddbname, PR_ACCESS_EXISTS); 358 status = PR_Access(olddbname, PR_ACCESS_EXISTS);
359 if (status == PR_SUCCESS) { 359 if (status == PR_SUCCESS) {
360 PR_smprintf_free(olddbname); 360 PR_smprintf_free(olddbname);
361 PORT_ZFree(moduleList, useCount*sizeof(char **));
wtc 2013/11/12 23:01:19 This is upstream changeset https://hg.mozilla.org/
361 PORT_SetError(SEC_ERROR_LEGACY_DATABASE); 362 PORT_SetError(SEC_ERROR_LEGACY_DATABASE);
362 return NULL; 363 return NULL;
363 } 364 }
364 365
365 bail: 366 bail:
366 if (olddbname) { 367 if (olddbname) {
367 PR_smprintf_free(olddbname); 368 PR_smprintf_free(olddbname);
368 } 369 }
369 } 370 }
370 371
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 rvstr = (nssutil_ReleaseSecmodDBData(appName,filename, 676 rvstr = (nssutil_ReleaseSecmodDBData(appName,filename,
676 secmod, (char **)args,rw) == SECSuccess) ? &success: NULL; 677 secmod, (char **)args,rw) == SECSuccess) ? &success: NULL;
677 break; 678 break;
678 } 679 }
679 done: 680 done:
680 if (secmod) PR_smprintf_free(secmod); 681 if (secmod) PR_smprintf_free(secmod);
681 if (appName) PORT_Free(appName); 682 if (appName) PORT_Free(appName);
682 if (filename) PORT_Free(filename); 683 if (filename) PORT_Free(filename);
683 return rvstr; 684 return rvstr;
684 } 685 }
OLDNEW
« nss/lib/certhigh/ocsp.c ('K') | « nss/lib/util/secport.c ('k') | nss/lib/util/utilpars.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698