diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
| commit | f4a12fc67689a830e9da1c87fd11afe5bc09deb3 (patch) | |
| tree | 211ae0cd022a6c11b0026ecc7761a550c584583c /security/nss/cmd/lib/derprint.c | |
| parent | f7d30133221896638f7bf4f66c504255c4b14f48 (diff) | |
| download | UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.gz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.lz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.xz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.zip | |
Issue #1338 - Part 2: Update NSS to 3.48-RTM
Diffstat (limited to 'security/nss/cmd/lib/derprint.c')
| -rw-r--r-- | security/nss/cmd/lib/derprint.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/nss/cmd/lib/derprint.c b/security/nss/cmd/lib/derprint.c index 08ef66d08..b86179e30 100644 --- a/security/nss/cmd/lib/derprint.c +++ b/security/nss/cmd/lib/derprint.c @@ -4,6 +4,8 @@ #include "secutil.h" #include "secoid.h" +#include <stdint.h> + #ifdef __sun extern int fprintf(FILE *strm, const char *format, ... /* args */); extern int fflush(FILE *stream); @@ -509,7 +511,7 @@ prettyPrintItem(FILE *out, const unsigned char *data, const unsigned char *end, /* * Just quit now if slen more bytes puts us off the end. */ - if ((data + slen) > end) { + if (data > end || slen > (end - data)) { PORT_SetError(SEC_ERROR_BAD_DER); return -1; } |