[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a9da48157c90b4b6d19d912666ad2183b5a16a1f (commit)
      from  8f09ba471c256020f8147c421e32b4d5fc162960 (commit)


- Log -----------------------------------------------------------------
commit a9da48157c90b4b6d19d912666ad2183b5a16a1f
Author: Rob Percival <robpercival at google.com>
Date:   Tue Jun 7 17:01:44 2016 +0100

    Fix potential access of null pointer (pp)
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1186)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ct/ct_oct.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c
index ced585f..cacc3bd 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: