Merge remote-tracking branch 'openssl/master'

Author: zh-jq

openssl/src/dsa.rs

@@ -72,7 +72,8 @@ impl<T> ToOwned for DsaRef<T> {
 
     fn to_owned(&self) -> Dsa<T> {
         unsafe {
-            ffi::DSA_up_ref(self.as_ptr());
+            let r = ffi::DSA_up_ref(self.as_ptr());
+            assert!(r == 1);
             Dsa::from_ptr(self.as_ptr())
         }
     }

openssl/src/macros.rs

@@ -231,6 +231,7 @@ macro_rules! generic_foreign_type_and_impl_send_sync {
                 fn clone(&self) -> $owned<T> {
                     unsafe {
                         let handle: *mut $ctype = $clone(self.0);
+                        assert!(!handle.is_null());
                         ::foreign_types::ForeignType::from_ptr(handle)
                     }
                 }
@@ -243,6 +244,7 @@ macro_rules! generic_foreign_type_and_impl_send_sync {
                     unsafe {
                         let handle: *mut $ctype =
                             $clone(::foreign_types::ForeignTypeRef::as_ptr(self));
+                        assert!(!handle.is_null());
                         $crate::ForeignType::from_ptr(handle)
                     }
                 }

openssl/src/pkey.rs

@@ -189,7 +189,8 @@ impl<T> ToOwned for PKeyRef<T> {
 
     fn to_owned(&self) -> PKey<T> {
         unsafe {
-            EVP_PKEY_up_ref(self.as_ptr());
+            let r = EVP_PKEY_up_ref(self.as_ptr());
+            assert!(r == 1);
             PKey::from_ptr(self.as_ptr())
         }
     }

openssl/src/rsa.rs

@@ -84,7 +84,8 @@ impl<T> ToOwned for RsaRef<T> {
 
     fn to_owned(&self) -> Rsa<T> {
         unsafe {
-            ffi::RSA_up_ref(self.as_ptr());
+            let r = ffi::RSA_up_ref(self.as_ptr());
+            assert!(r == 1);
             Rsa::from_ptr(self.as_ptr())
         }
     }

openssl/src/ssl/mod.rs

@@ -2282,7 +2282,8 @@ impl ToOwned for SslContextRef {
 
     fn to_owned(&self) -> Self::Owned {
         unsafe {
-            SSL_CTX_up_ref(self.as_ptr());
+            let r = SSL_CTX_up_ref(self.as_ptr());
+            assert!(r == 1);
             SslContext::from_ptr(self.as_ptr())
         }
     }
@@ -2669,7 +2670,8 @@ impl ToOwned for SslSessionRef {
 
     fn to_owned(&self) -> SslSession {
         unsafe {
-            SSL_SESSION_up_ref(self.as_ptr());
+            let r = SSL_SESSION_up_ref(self.as_ptr());
+            assert!(r == 1);
             SslSession(self.as_ptr())
         }
     }

openssl/src/x509/mod.rs

@@ -825,7 +825,8 @@ impl ToOwned for X509Ref {
 
     fn to_owned(&self) -> X509 {
         unsafe {
-            X509_up_ref(self.as_ptr());
+            let r = X509_up_ref(self.as_ptr());
+            assert!(r == 1);
             X509::from_ptr(self.as_ptr())
         }
     }