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

Fix a memory leak (there's another around here somewhere, though).

Browse Source 
PR:
This commit is contained in:
Ben Laurie 2001-06-17 14:42:57 +00:00
parent 09a2615fb2
commit 853b1eb424
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
crypto/engine/engine_list.c
View File

@ -85,6 +85,7 @@ static ENGINE *engine_list_tail = NULL;
* is needed because the engine list may genuinely become empty during * is needed because the engine list may genuinely become empty during
* use (so we can't use engine_list_head as an indicator for example. */ * use (so we can't use engine_list_head as an indicator for example. */
static int engine_list_flag = 0; static int engine_list_flag = 0;
static int ENGINE_free_nolock(ENGINE *e);
/* These static functions starting with a lower case "engine_" always /* These static functions starting with a lower case "engine_" always
* take place when CRYPTO_LOCK_ENGINE has been locked up. */ * take place when CRYPTO_LOCK_ENGINE has been locked up. */
@ -176,9 +177,7 @@ static int engine_list_remove(ENGINE *e)
engine_list_head = e->next; engine_list_head = e->next;
if(engine_list_tail == e) if(engine_list_tail == e)
engine_list_tail = e->prev; engine_list_tail = e->prev;
/* remove our structural reference. */ ENGINE_free_nolock(e);
e->struct_ref--;
engine_ref_debug(e, 0, -1)
return 1; return 1;
} }
@ -200,13 +199,7 @@ static int engine_internal_check(void)
toret = 0; toret = 0;
else else
engine_list_flag = 1; engine_list_flag = 1;
#if 0 ENGINE_free_nolock(def_engine);
ENGINE_free(def_engine);
#else
/* We can't ENGINE_free() because the lock's already held */
def_engine->struct_ref--;
engine_ref_debug(def_engine, 0, -1)
#endif
return 1; return 1;
} }
@ -429,6 +422,32 @@ int ENGINE_free(ENGINE *e)
return 1; return 1;
} }
static int ENGINE_free_nolock(ENGINE *e)
{
int i;
if(e == NULL)
{
ENGINEerr(ENGINE_F_ENGINE_FREE,
ERR_R_PASSED_NULL_PARAMETER);
return 0;
}
i=--e->struct_ref;
engine_ref_debug(e, 0, -1)
if (i > 0) return 1;
#ifdef REF_CHECK
if (i < 0)
{
fprintf(stderr,"ENGINE_free, bad structural reference count\n");
abort();
}
#endif
CRYPTO_free_ex_data(engine_ex_data_stack, e, &e->ex_data);
OPENSSL_free(e);
return 1;
}
int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
{ {