generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate memory leaks in mem_dbg.c.

Browse Source
This commit is contained in:
Bodo Möller 2000-03-18 15:18:27 +00:00
parent cde245bdcd
commit 6e22639f46
4 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openssl.c
View File

@ -206,7 +206,7 @@ end:
EVP_cleanup(); EVP_cleanup();
ERR_free_strings(); ERR_free_strings();
CRYPTO_mem_leaks(bio_err); CRYPTO_mem_leaks(bio_err);
if (bio_err != NULL) if (bio_err != NULL)
{ {

19
crypto/lhash/lhash.c
View File

@ -422,21 +422,6 @@ static LHASH_NODE **getrn(LHASH *lh, void *data, unsigned long *rhash)
return(ret); return(ret);
} }
/*
unsigned long lh_strhash(char *str)
{
int i,l;
unsigned long ret=0;
unsigned short *s;
if (str == NULL) return(0);
l=(strlen(str)+1)/2;
s=(unsigned short *)str;
for (i=0; i<l; i++)
ret^=(s[i]<<(i&0x0f));
return(ret);
} */
/* The following hash seems to work very well on normal text strings /* The following hash seems to work very well on normal text strings
* no collisions on /usr/dict/words and it distributes on %2^n quite * no collisions on /usr/dict/words and it distributes on %2^n quite
* well, not as good as MD5, but still good. * well, not as good as MD5, but still good.
@ -470,3 +455,7 @@ unsigned long lh_strhash(const char *c)
return((ret>>16)^ret); return((ret>>16)^ret);
} }
unsigned long lh_num_items(LHASH *lh)
{
return lh ? lh->num_items : 0;
}

1
crypto/lhash/lhash.h
View File

@ -124,6 +124,7 @@ void *lh_retrieve(LHASH *lh, void *data);
void lh_doall(LHASH *lh, void (*func)(/*void *b*/)); void lh_doall(LHASH *lh, void (*func)(/*void *b*/));
void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg); void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg);
unsigned long lh_strhash(const char *c); unsigned long lh_strhash(const char *c);
unsigned long lh_num_items(LHASH *lh);
#ifndef NO_FP_API #ifndef NO_FP_API
void lh_stats(LHASH *lh, FILE *out); void lh_stats(LHASH *lh, FILE *out);

43
crypto/mem_dbg.c
View File

@ -640,19 +640,54 @@ void CRYPTO_mem_leaks(BIO *b)
MEM_LEAK ml; MEM_LEAK ml;
char buf[80]; char buf[80];
if (mh == NULL) return; if (mh == NULL && amih == NULL)
return;
ml.bio=b; ml.bio=b;
ml.bytes=0; ml.bytes=0;
ml.chunks=0; ml.chunks=0;
CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2); MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml); if (mh != NULL)
CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2); lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml);
if (ml.chunks != 0) if (ml.chunks != 0)
{ {
sprintf(buf,"%ld bytes leaked in %d chunks\n", sprintf(buf,"%ld bytes leaked in %d chunks\n",
ml.bytes,ml.chunks); ml.bytes,ml.chunks);
BIO_puts(b,buf); BIO_puts(b,buf);
} }
else
{
/* Make sure that, if we found no leaks, memory-leak debugging itself
* does not introduce memory leaks (which might irritate
* external debugging tools).
* (When someone enables leak checking, but does not call
* this function, we declare it to be their fault.)
*
* XXX This should be in CRYPTO_mem_leaks_cb,
* and CRYPTO_mem_leaks should be implemented by
* using CRYPTO_mem_leaks_cb.
* (Also their should be a variant of lh_doall_arg
* that takes a function pointer instead of a void *;
* this would obviate the ugly and illegal
* void_fn_to_char kludge in CRYPTO_mem_leaks_cb.
* Otherwise the code police will come and get us.)
*/
CRYPTO_w_lock(CRYPTO_LOCK_MALLOC);
if (mh != NULL)
{
lh_free(mh);
mh = NULL;
}
if (amih != NULL)
{
if (lh_num_items(amih) == 0)
{
lh_free(amih);
amih = NULL;
}
}
CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC);
}
MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
#if 0 #if 0
lh_stats_bio(mh,b); lh_stats_bio(mh,b);