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

Actually there were two error cases that could return without releasing the

Browse Source 
lock - stupidly, my last change addressed only one of them.
This commit is contained in:
Geoff Thorpe 2001-04-02 17:21:36 +00:00
parent 3f86a2b147
commit e4dc18d7e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/engine/engine_lib.c
View File

@ -288,20 +288,21 @@ EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
{ {
int ctrl_exists; int ctrl_exists, ref_exists;
if(e == NULL) if(e == NULL)
{ {
ENGINEerr(ENGINE_F_ENGINE_CTRL,ERR_R_PASSED_NULL_PARAMETER); ENGINEerr(ENGINE_F_ENGINE_CTRL,ERR_R_PASSED_NULL_PARAMETER);
return 0; return 0;
} }
CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
if(e->struct_ref == 0) ref_exists = ((e->struct_ref > 0) ? 1 : 0);
ctrl_exists = (e->ctrl ? 1 : 0);
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
if(!ref_exists)
{ {
ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_REFERENCE); ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_REFERENCE);
return 0; return 0;
} }
ctrl_exists = (e->ctrl ? 1 : 0);
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
if (!ctrl_exists) if (!ctrl_exists)
{ {
ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_CONTROL_FUNCTION); ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_CONTROL_FUNCTION);