diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-12 00:58:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 00:58:35 +0200 |
| commit | b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387 (patch) | |
| tree | 40d946c5ff23b3c0c09558f478cc68e87cc71448 /security/nss/lib/freebl/stubs.c | |
| parent | b1d82a62259c6888ea6f3f71f3e0973ea4b4e85e (diff) | |
| parent | 505a561549b5226fd3c7905eaa61fe787dfad243 (diff) | |
| download | UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.gz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.lz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.xz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.zip | |
Merge pull request #477 from JustOff/PR_nss-3.36
Update NSS/NSPR to 3.36.4/4.19
Diffstat (limited to 'security/nss/lib/freebl/stubs.c')
| -rw-r--r-- | security/nss/lib/freebl/stubs.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/security/nss/lib/freebl/stubs.c b/security/nss/lib/freebl/stubs.c index 4d41ef975..c42f694d7 100644 --- a/security/nss/lib/freebl/stubs.c +++ b/security/nss/lib/freebl/stubs.c @@ -36,6 +36,7 @@ #include <secport.h> #include <secitem.h> #include <blapi.h> +#include <assert.h> #include <private/pprio.h> /* Android API < 21 doesn't define RTLD_NOLOAD */ @@ -252,7 +253,12 @@ PORT_ZAllocAligned_stub(size_t bytes, size_t alignment, void **mem) } memset(*mem, 0, len); - return (void *)(((uintptr_t)*mem + x) & ~(uintptr_t)x); + + /* We're pretty sure this is non-zero, but let's assure scan-build too. */ + void *ret = (void *)(((uintptr_t)*mem + x) & ~(uintptr_t)x); + assert(ret); + + return ret; } extern void * |