diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
| commit | 580084e9e1d0355c96a54a9641df6c1fee894948 (patch) | |
| tree | 5aff416b5aed2ca9e326054567d837f28c20ed25 /security/nss/lib/softoken/legacydb | |
| parent | fc61780b35af913801d72086456f493f63197da6 (diff) | |
| parent | b28ab55f9675f2e97dda9a4fcac0d4f5267a2bb9 (diff) | |
| download | UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.gz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.lz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.xz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.zip | |
Merge branch 'master' into Basilisk-releasev2018.09.05
Diffstat (limited to 'security/nss/lib/softoken/legacydb')
| -rw-r--r-- | security/nss/lib/softoken/legacydb/pcertdb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/nss/lib/softoken/legacydb/pcertdb.c b/security/nss/lib/softoken/legacydb/pcertdb.c index 2e8b650ee..47778190d 100644 --- a/security/nss/lib/softoken/legacydb/pcertdb.c +++ b/security/nss/lib/softoken/legacydb/pcertdb.c @@ -2577,14 +2577,13 @@ ReadDBSubjectEntry(NSSLOWCERTCertDBHandle *handle, SECItem *derSubject) SECItem dbentry; SECStatus rv; + PORT_InitCheapArena(&tmpArena, DER_DEFAULT_CHUNKSIZE); arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); if (arena == NULL) { PORT_SetError(SEC_ERROR_NO_MEMORY); goto loser; } - PORT_InitCheapArena(&tmpArena, DER_DEFAULT_CHUNKSIZE); - entry = (certDBEntrySubject *)PORT_ArenaAlloc(arena, sizeof(certDBEntrySubject)); if (entry == NULL) { |