Replace all push zero operations to calling ensure_end_with_zero function.

Author: jmjoy

phper/src/functions.rs

@@ -11,6 +11,7 @@ use crate::{
     sys::*,
     values::{ExecuteData, SetVal, Val},
 };
+use crate::utils::ensure_end_with_zero;
 
 pub trait Function: Send + Sync {
     fn call(&self, arguments: &mut [Val], return_value: &mut Val);
@@ -61,8 +62,7 @@ pub struct FunctionEntity {
 
 impl FunctionEntity {
     pub(crate) fn new(name: impl ToString, handler: Callable, arguments: Vec<Argument>) -> Self {
-        let mut name = name.to_string();
-        name.push('\0');
+        let name = ensure_end_with_zero(name);
         FunctionEntity {
             name,
             handler,
@@ -111,8 +111,7 @@ pub struct Argument {
 
 impl Argument {
     pub fn by_val(name: impl ToString) -> Self {
-        let mut name = name.to_string();
-        name.push('\0');
+        let name = ensure_end_with_zero(name);
         Self {
             name,
             pass_by_ref: false,
@@ -121,8 +120,7 @@ impl Argument {
     }
 
     pub fn by_ref(name: impl ToString) -> Self {
-        let mut name = name.to_string();
-        name.push('\0');
+        let name = ensure_end_with_zero(name);
         Self {
             name,
             pass_by_ref: true,
@@ -131,8 +129,7 @@ impl Argument {
     }
 
     pub fn by_val_optional(name: impl ToString) -> Self {
-        let mut name = name.to_string();
-        name.push('\0');
+        let name = ensure_end_with_zero(name);
         Self {
             name,
             pass_by_ref: false,
@@ -141,8 +138,7 @@ impl Argument {
     }
 
     pub fn by_ref_optional(name: impl ToString) -> Self {
-        let mut name = name.to_string();
-        name.push('\0');
+        let name = ensure_end_with_zero(name);
         Self {
             name,
             pass_by_ref: true,

phper/src/modules.rs

@@ -16,6 +16,7 @@ use std::{
     ptr::{null, null_mut},
     sync::RwLock,
 };
+use crate::utils::ensure_end_with_zero;
 
 static GLOBAL_MODULE: Lazy<RwLock<Module>> = Lazy::new(Default::default);
 
@@ -105,20 +106,17 @@ impl Module {
     }
 
     pub fn set_name(&mut self, name: impl ToString) {
-        let mut name = name.to_string();
-        name.push('\0');
+        let name = ensure_end_with_zero(name);
         self.name = name;
     }
 
     pub fn set_version(&mut self, version: impl ToString) {
-        let mut version = version.to_string();
-        version.push('\0');
+        let version = ensure_end_with_zero(version);
         self.version = version;
     }
 
     pub fn set_author(&mut self, author: impl ToString) {
-        let mut author = author.to_string();
-        author.push('\0');
+        let author = ensure_end_with_zero(author);
         self.author = author;
     }
 

phper/src/values.rs

@@ -1,5 +1,6 @@
 use crate::{arrays::Array, errors::Throwable, sys::*};
 use std::{mem::zeroed, slice::from_raw_parts, str, sync::atomic::Ordering};
+use crate::utils::ensure_end_with_zero;
 
 #[repr(transparent)]
 pub struct ExecuteData {
@@ -221,8 +222,7 @@ impl<T: SetVal, E: Throwable> SetVal for Result<T, E> {
                     .class_entity()
                     .as_ref()
                     .expect("class entry is null pointer");
-                let mut message = e.to_string();
-                message.push('\0');
+                let message = ensure_end_with_zero(&e);
                 zend_throw_exception(
                     class.entry.load(Ordering::SeqCst).cast(),
                     message.as_ptr().cast(),