[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  6fcace45bda108ad4d3f95261494dd479720d92c (commit)
      from  4588cb4443552f1d251a637b48f39d891051ee1c (commit)


- Log -----------------------------------------------------------------
commit 6fcace45bda108ad4d3f95261494dd479720d92c
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>

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

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;
         }