diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-12-09 13:38:05 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-12-09 13:38:05 +0000 |
| commit | fdb2c6e4e5b8c2065a289bca879820ea61a3c636 (patch) | |
| tree | 967357e36692689f2eab5b9daf763cd21674be46 /crypto/lhash | |
| parent | 7661ccadf0f5251eb525a1dfdaed22bc406c823a (diff) | |
PR: 2124
Submitted by: Jan Pechanec <Jan.Pechanec@Sun.COM>
Check for memory allocation failures.
Diffstat (limited to 'crypto/lhash')
| -rw-r--r-- | crypto/lhash/lhash.c | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index 47f748081b..528f9c7cef 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -310,16 +310,40 @@ 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; + unsigned int p,i,j,pmax; 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; i<j; i++)/* 26/02/92 eay */ + n[i]=NULL; /* 02/03/92 eay */ + lh->pmax=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+(int)lh->pmax]); + n2= &(lh->b[p+pmax]); *n2=NULL; /* 27/07/92 - eay - undefined pointer bug */ - nni=lh->num_alloc_nodes; for (np= *n1; np != NULL; ) { @@ -388,6 +412,7 @@ static void contract(_LHASH *lh) else lh->p--; + lh->b[idx] = NULL; lh->num_nodes--; lh->num_contracts++; |