diff options
| author | Rob Percival <robpercival@google.com> | 2016-06-07 17:01:44 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-07 12:21:46 -0400 |
| commit | a9da48157c90b4b6d19d912666ad2183b5a16a1f (patch) | |
| tree | c4b4096565b1ad00f7f69b84ae974d8a2f0ebbb6 /crypto/ct/ct_oct.c | |
| parent | 8f09ba471c256020f8147c421e32b4d5fc162960 (diff) | |
| download | openssl-new-a9da48157c90b4b6d19d912666ad2183b5a16a1f.tar.gz | |
Fix potential access of null pointer (pp)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1186)
Diffstat (limited to 'crypto/ct/ct_oct.c')
| -rw-r--r-- | crypto/ct/ct_oct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c index ced585f6ba..cacc3bd2b4 100644 --- a/crypto/ct/ct_oct.c +++ b/crypto/ct/ct_oct.c @@ -365,9 +365,9 @@ int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp) if (pp != NULL) { p = *pp; s2n(len2 - 2, p); + if (!is_pp_new) + *pp += len2; } - if (!is_pp_new) - *pp += len2; return len2; err: |