min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check null ptr for non-x509 X509Object

This commit is contained in:
Noah 2020-03-23 10:20:30 -05:00
parent dfb3cb9579
commit e268a5ac7e
No known key found for this signature in database
GPG Key ID: E8C14146AE337195
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openssl/src/x509/mod.rs
View File

@ -1335,10 +1335,11 @@ foreign_type_and_impl_send_sync! {
impl X509ObjectRef {
pub fn x509(&self) -> Option<&X509Ref> {
unsafe {
if X509_OBJECT_get_type(self.as_ptr()) == ffi::X509_LU_X509 {
Some(X509Ref::from_ptr(X509_OBJECT_get0_X509(self.as_ptr())))
} else {
let ptr = X509_OBJECT_get0_X509(self.as_ptr());
if ptr.is_null() {
None
} else {
Some(X509Ref::from_ptr(ptr))
}
}
}
@ -1431,16 +1432,15 @@ cfg_if! {
cfg_if! {
if #[cfg(any(ossl110, libressl270))] {
use ffi::{X509_OBJECT_get_type, X509_OBJECT_get0_X509};
use ffi::X509_OBJECT_get0_X509;
} else {
#[allow(bad_style)]
unsafe fn X509_OBJECT_get_type(x: *mut ffi::X509_OBJECT) -> ffi::X509_LOOKUP_TYPE {
(*x).type_
}
#[allow(bad_style)]
unsafe fn X509_OBJECT_get0_X509(x: *mut ffi::X509_OBJECT) -> *mut ffi::X509 {
if (*x).type_ == ffi::X509_LU_X509 {
(*x).data.x509
} else {
ptr::null_mut()
}
}
}
}