diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
| commit | 4a71b30364a4b6d1eaf16fcfdc8e873e6697f293 (patch) | |
| tree | a47014077c14579249859ad34afcc5a8f2f0730a /security/nss/lib/util/quickder.c | |
| parent | d7da72799521386c110dbba73b1e483b00a0a56a (diff) | |
| parent | 2dad0ec41d0b69c0a815012e6ea4bdde81b2875b (diff) | |
| download | UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.gz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.lz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.xz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.zip | |
Merge branch 'NSS-335'
Diffstat (limited to 'security/nss/lib/util/quickder.c')
| -rw-r--r-- | security/nss/lib/util/quickder.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/nss/lib/util/quickder.c b/security/nss/lib/util/quickder.c index 1b474822e..7a6ac1c53 100644 --- a/security/nss/lib/util/quickder.c +++ b/security/nss/lib/util/quickder.c @@ -520,8 +520,7 @@ DecodeGroup(void* dest, if (SECSuccess == rv) { /* allocate room for pointer array and entries */ /* we want to allocate the array even if there is 0 entry */ - entries = (void**)PORT_ArenaZAlloc(arena, sizeof(void*) * - (totalEntries + 1) + /* the extra one is for NULL termination */ + entries = (void**)PORT_ArenaZAlloc(arena, sizeof(void*) * (totalEntries + 1) + /* the extra one is for NULL termination */ subTemplate->size * totalEntries); if (entries) { |