Stop mishandling the type number in dynlock locking

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 9de60fd52816baf297cd9b3e73ccb400fbe95071..48ce8c28ab4a9539d282c57d24487175a87949a9 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -241,7 +241,7 @@ void CRYPTO_destroy_dynlockid(int i)
                        }
                else
 #endif
-                       if (--(pointer->references) <= 0)
+                       if (pointer->references <= 0)
                                {
                                sk_CRYPTO_dynlock_set(dyn_locks, i, NULL);
                                }
@@ -396,16 +396,15 @@ void CRYPTO_lock(int mode, int type, const char *file, int line)
 #endif
        if (type < 0)
                {
-               int i = -type - 1;
                struct CRYPTO_dynlock_value *pointer
-                       = CRYPTO_get_dynlock_value(i);
+                       = CRYPTO_get_dynlock_value(type);
 
-               if (pointer)
+               if (pointer && dynlock_lock_callback)
                        {
                        dynlock_lock_callback(mode, pointer, file, line);
                        }
 
-               CRYPTO_destroy_dynlockid(i);
+               CRYPTO_destroy_dynlockid(type);
                }
        else
                if (locking_callback != NULL)