Don't decrement the reference counter twice when destroying dynamic
authorRichard Levitte <levitte@openssl.org>
Thu, 31 May 2001 22:25:30 +0000 (22:25 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 31 May 2001 22:25:30 +0000 (22:25 +0000)
links.

crypto/cryptlib.c

index 5871216b0b97846757c566040a6185731b88e728..5da4828f88a2640b68c03811a54de1438cfa2c52 100644 (file)
@@ -242,7 +242,7 @@ void CRYPTO_destroy_dynlockid(int i)
                        }
                else
 #endif
                        }
                else
 #endif
-                       if (--(pointer->references) <= 0)
+                       if (pointer->references <= 0)
                                {
                                sk_CRYPTO_dynlock_set(dyn_locks, i, NULL);
                                }
                                {
                                sk_CRYPTO_dynlock_set(dyn_locks, i, NULL);
                                }
@@ -401,7 +401,7 @@ void CRYPTO_lock(int mode, int type, const char *file, int line)
                struct CRYPTO_dynlock_value *pointer
                        = CRYPTO_get_dynlock_value(i);
 
                struct CRYPTO_dynlock_value *pointer
                        = CRYPTO_get_dynlock_value(i);
 
-               if (pointer)
+               if (pointer && dynlock_lock_callback)
                        {
                        dynlock_lock_callback(mode, pointer, file, line);
                        }
                        {
                        dynlock_lock_callback(mode, pointer, file, line);
                        }