projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f09ba4
)
Fix potential access of null pointer (pp)
author
Rob Percival
<robpercival@google.com>
Tue, 7 Jun 2016 16:01:44 +0000
(17:01 +0100)
committer
Rich Salz
<rsalz@openssl.org>
Tue, 7 Jun 2016 16:21:46 +0000
(12:21 -0400)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1186)
crypto/ct/ct_oct.c
patch
|
blob
|
history
diff --git
a/crypto/ct/ct_oct.c
b/crypto/ct/ct_oct.c
index ced585f6ba439b6cc5dc1d95c3cffba2c0f8a593..cacc3bd2b4fda583276c406cf125b921f465401c 100644
(file)
--- 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: