Commit 6e22639f authored by Bodo Möller's avatar Bodo Möller
Browse files

Eliminate memory leaks in mem_dbg.c.

parent cde245bd

crypto/lhash/lhash.c

+4 −15
Original line number Diff line number Diff line
@@ -422,21 +422,6 @@ static LHASH_NODE **getrn(LHASH *lh, void *data, unsigned long *rhash) 
	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

 * no collisions on /usr/dict/words and it distributes on %2^n quite

 * well, not as good as MD5, but still good.
@@ -470,3 +455,7 @@ unsigned long lh_strhash(const char *c) 
	return((ret>>16)^ret);

	}



unsigned long lh_num_items(LHASH *lh)

	{

	return lh ? lh->num_items : 0;

	}

crypto/lhash/lhash.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ void *lh_retrieve(LHASH *lh, void *data); 
    void lh_doall(LHASH *lh, void (*func)(/*void *b*/));

void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg);

unsigned long lh_strhash(const char *c);

unsigned long lh_num_items(LHASH *lh);



#ifndef NO_FP_API

void lh_stats(LHASH *lh, FILE *out);

crypto/mem_dbg.c

+39 −4
Original line number Diff line number Diff line
@@ -640,19 +640,54 @@ void CRYPTO_mem_leaks(BIO *b) 
	MEM_LEAK ml;

	char buf[80];



	if (mh == NULL) return;

	if (mh == NULL && amih == NULL)

		return;

	ml.bio=b;

	ml.bytes=0;

	ml.chunks=0;

	CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2);

	MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */

	if (mh != NULL)

		lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml);

	CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2);

	if (ml.chunks != 0)

		{

		sprintf(buf,"%ld bytes leaked in %d chunks\n",

			ml.bytes,ml.chunks);

		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

	lh_stats_bio(mh,b);

apps/openssl.c

+1 −1

File changed.

Contains only whitespace changes.