Skip to content

Try tests with Cstring #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2023
Merged

Try tests with Cstring #301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f84fdfe
Try tests with Cstring
joehoyle Dec 1, 2023
e797430
fmt
joehoyle Dec 1, 2023
7068a03
Remove unused type
joehoyle Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/zend/_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
use std::{ffi::c_void, ptr};
use std::{
ffi::{c_void, CString},
ptr,
};

use crate::{
ffi::{
zend_type, IS_MIXED, MAY_BE_ANY, MAY_BE_BOOL, _IS_BOOL, _ZEND_IS_VARIADIC_BIT,
_ZEND_SEND_MODE_SHIFT, _ZEND_TYPE_NAME_BIT, _ZEND_TYPE_NULLABLE_BIT,
},
flags::DataType,
types::ZendStr,
};

/// Internal Zend type.
Expand Down Expand Up @@ -80,7 +82,7 @@ impl ZendType {
allow_null: bool,
) -> Option<Self> {
Some(Self {
ptr: ZendStr::new(class_name, true).into_raw().as_ptr() as *mut c_void,
ptr: CString::new(class_name).ok()?.into_raw() as *mut c_void,
type_mask: _ZEND_TYPE_NAME_BIT
| (if allow_null {
_ZEND_TYPE_NULLABLE_BIT
Expand Down