24377801 solaris_dynlock_create() should check for a ret val of 0 from pthread_mutex_init
authorakshat.harit@oracle.com <akshat.harit@oracle.com>
Tue, 16 Aug 2016 16:42:23 -0700
changeset 6619 57ad7bed64ee
parent 6618 b9e3744293ad
child 6620 f7ee96f81c70
24377801 solaris_dynlock_create() should check for a ret val of 0 from pthread_mutex_init
components/openssl/common/patches/029-fork_safe.patch
components/openssl/openssl-default/patches/102-wanboot.patch
--- a/components/openssl/common/patches/029-fork_safe.patch	Tue Aug 16 11:45:17 2016 -0700
+++ b/components/openssl/common/patches/029-fork_safe.patch	Tue Aug 16 16:42:23 2016 -0700
@@ -93,7 +93,7 @@
 +    }
 +
 +    ret = pthread_mutex_init(dynlock, NULL);
-+    OPENSSL_assert(ret);
++    OPENSSL_assert(ret == 0);
 +
 +    return ((struct CRYPTO_dynlock_value *)dynlock);
 +}
@@ -119,7 +119,7 @@
 +{
 +    int ret;
 +    ret = pthread_mutex_destroy((pthread_mutex_t *)dynlock);
-+    OPENSSL_assert(ret);
++    OPENSSL_assert(ret == 0);
 +}
 +
 +
--- a/components/openssl/openssl-default/patches/102-wanboot.patch	Tue Aug 16 11:45:17 2016 -0700
+++ b/components/openssl/openssl-default/patches/102-wanboot.patch	Tue Aug 16 16:42:23 2016 -0700
@@ -59,7 +59,7 @@
      pthread_mutex_t    *dynlock;
 
 @@ -446,6 +449,9 @@
-     OPENSSL_assert(ret);
+     OPENSSL_assert(ret == 0);
 
      return ((struct CRYPTO_dynlock_value *)dynlock);
 +#else
@@ -91,7 +91,7 @@
 +#ifndef    _BOOT
      int ret;
      ret = pthread_mutex_destroy((pthread_mutex_t *)dynlock);
-     OPENSSL_assert(ret);
+     OPENSSL_assert(ret == 0);
 +#endif
  }