From e4bcadb3021e875f94b4a37b0edd18a83b7569a8 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 9 Dec 2009 14:59:47 +0000 Subject: [PATCH 1/1] Revert lhash patch for PR#2124 --- crypto/lhash/lhash.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index 528f9c7cef..47f748081b 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -310,40 +310,16 @@ void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg) static void expand(_LHASH *lh) { LHASH_NODE **n,**n1,**n2,*np; - unsigned int p,i,j,pmax; + unsigned int p,i,j; unsigned long hash,nni; - p=(int)lh->p++; - nni=lh->num_alloc_nodes; - pmax=lh->pmax; - - if ((lh->p) >= lh->pmax) - { - j=(int)lh->num_alloc_nodes*2; - n=(LHASH_NODE **)OPENSSL_realloc(lh->b, - (int)sizeof(LHASH_NODE *)*j); - if (n == NULL) - { -/* fputs("realloc error in lhash",stderr); */ - lh->error++; - lh->p=0; - return; - } - /* else */ - for (i=(int)lh->num_alloc_nodes; ipmax=lh->num_alloc_nodes; - lh->num_alloc_nodes=j; - lh->num_expand_reallocs++; - lh->p=0; - lh->b=n; - } - lh->num_nodes++; lh->num_expands++; + p=(int)lh->p++; n1= &(lh->b[p]); - n2= &(lh->b[p+pmax]); + n2= &(lh->b[p+(int)lh->pmax]); *n2=NULL; /* 27/07/92 - eay - undefined pointer bug */ + nni=lh->num_alloc_nodes; for (np= *n1; np != NULL; ) { @@ -412,7 +388,6 @@ static void contract(_LHASH *lh) else lh->p--; - lh->b[idx] = NULL; lh->num_nodes--; lh->num_contracts++; -- 2.34.1