wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sk_*_push() returns the number of items on the stack, not the index of the

Browse source 
pushed item.  The index is the number of items - 1.  And if a NULL item was
found, actually use it.
Finally, provide a little bit of safety in CRYPTO_lock() by asserting the a
requested dynamic lock really must exist, instead of just being silent about it
This commit is contained in:
Richard Levitte 2002-12-11 08:33:37 +00:00
parent cd7f458e28
commit 7627efc92f
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crypto/cryptlib.c
View file

@ -207,10 +207,18 @@ int CRYPTO_get_new_dynlockid(void)
i=sk_CRYPTO_dynlock_find(dyn_locks,NULL); i=sk_CRYPTO_dynlock_find(dyn_locks,NULL);
/* If there was none, push, thereby creating a new one */ /* If there was none, push, thereby creating a new one */
if (i == -1) if (i == -1)
i=sk_CRYPTO_dynlock_push(dyn_locks,pointer); /* Since sk_push() returns the number of items on the
stack, not the location of the pushed item, we need
to transform the returned number into a position,
by decreasing it. */
i=sk_CRYPTO_dynlock_push(dyn_locks,pointer) - 1;
else
/* If we found a place with a NULL pointer, put our pointer
in it. */
sk_CRYPTO_dynlock_set(dyn_locks,i,pointer);
CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
if (!i) if (i == -1)
{ {
dynlock_destroy_callback(pointer->data,__FILE__,__LINE__); dynlock_destroy_callback(pointer->data,__FILE__,__LINE__);
OPENSSL_free(pointer); OPENSSL_free(pointer);
@ -405,7 +413,9 @@ void CRYPTO_lock(int mode, int type, const char *file, int line)
struct CRYPTO_dynlock_value *pointer struct CRYPTO_dynlock_value *pointer
= CRYPTO_get_dynlock_value(type); = CRYPTO_get_dynlock_value(type);
if (pointer && dynlock_lock_callback) OPENSSL_assert(pointer != NULL);
if (dynlock_lock_callback)
{ {
dynlock_lock_callback(mode, pointer, file, line); dynlock_lock_callback(mode, pointer, file, line);
} }