[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

Rich Salz rsalz at openssl.org
Wed Sep 21 14:41:25 UTC 2016


The branch OpenSSL_1_1_0-stable has been updated
       via  bf0404fe4afe9ed1e09e11b2b8f82b9ec127de91 (commit)
      from  64d1cc09f912fdc92b12588cc9ad189978051a3e (commit)


- Log -----------------------------------------------------------------
commit bf0404fe4afe9ed1e09e11b2b8f82b9ec127de91
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Sep 9 10:52:59 2016 -0400

    GH1555: Don't bump size on realloc failure
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 6fcace45bda108ad4d3f95261494dd479720d92c)

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

Summary of changes:
 crypto/lhash/lhash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 19c6d2c..adde832 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -213,8 +213,8 @@ static int expand(OPENSSL_LHASH *lh)
         j = (int)lh->num_alloc_nodes * 2;
         n = OPENSSL_realloc(lh->b, (int)(sizeof(OPENSSL_LH_NODE *) * j));
         if (n == NULL) {
-            /* fputs("realloc error in lhash",stderr); */
             lh->error++;
+            lh->num_nodes--;
             lh->p = 0;
             return 0;
         }


More information about the openssl-commits mailing list