From 60872c4a3e4b55efae87b392bd6e67c44c9dd1ae Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Mon, 26 Oct 2026 12:01:41 -0700 Subject: [PATCH] Properly use `zend_long` when parsing parameters Otherwise Rust might infer `i32` (4 bytes) while PHP is using `zend_long` (8 bytes), leading to PHP overwriting other memory, e.g. the next variable. This fixes the issue with the ZPP test in the demo extension having the wrong result for nullable integer parameters - the memory overwritten was the variable for marking if the integer was null or not. --- crates/macros-rs/src/zpp.rs | 16 ++++++- example/rust-ext-demo/src/lib.rs | 11 +++-- example/rust-ext-demo/tests/zpp.phpt | 64 ++++++++++++++-------------- 3 files changed, 53 insertions(+), 38 deletions(-) diff --git a/crates/macros-rs/src/zpp.rs b/crates/macros-rs/src/zpp.rs index 66aa95c..55c08d6 100644 --- a/crates/macros-rs/src/zpp.rs +++ b/crates/macros-rs/src/zpp.rs @@ -239,10 +239,22 @@ macro_rules! __impl__ZEND_PARSE_ARGS { $crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "f!" ] [ $( $args )* ] ) }; ( @make_spec [ $( $p:expr )+ ] [ Z_PARAM_LONG( $v:expr ) $( $args:tt )* ] ) => { - $crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l" ] [ $( $args )* ]) + { + // Force the correct type, the inferred i32 might be a different size + // than the expected zend_long, leading to the next parameter overwriting + // this one + let _type_check: rsphp_sys::zend_long = $v; + $crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l" ] [ $( $args )* ]) + } }; ( @make_spec [ $( $p:expr )+ ] [ Z_PARAM_LONG_OR_NULL( $v1:expr, $v2:expr ) $( $args:tt )* ] ) => { - $crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l!" ] [ $( $args )* ]) + { + // Force the correct type, the inferred i32 might be a different size + // than the expected zend_long, leading to the next parameter overwriting + // this one + let _type_check: rsphp_sys::zend_long = $v1; + $crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l!" ] [ $( $args )* ]) + } }; ( @make_spec [ $( $p:expr )+ ] [ Z_PARAM_DOUBLE( $v:expr ) $( $args:tt )* ] ) => { $crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "d" ] [ $( $args )* ]) diff --git a/example/rust-ext-demo/src/lib.rs b/example/rust-ext-demo/src/lib.rs index 21c6fcf..e407ce8 100644 --- a/example/rust-ext-demo/src/lib.rs +++ b/example/rust-ext-demo/src/lib.rs @@ -11,8 +11,9 @@ use rsphp_macros_rs::{ZEND_FE, ZEND_PARSE_ARGS, ZEND_PARSE_PARAMETERS_NONE}; use rsphp_sys::{ HashTable, ZEND_CALL_HAS_EXTRA_NAMED_PARAMS, ZEND_RESULT_CODE, display_ini_entries, php_output_write, php_printf, php_var_dump, zend_class_entry, zend_execute_data, - zend_function_entry, zend_module_entry, zend_parse_parameters, zend_register_ini_entries_ex, - zend_result, zend_string, zend_string_init, zend_unregister_ini_entries_ex, zval, + zend_function_entry, zend_long, zend_module_entry, zend_parse_parameters, + zend_register_ini_entries_ex, zend_result, zend_string, zend_string_init, + zend_unregister_ini_entries_ex, zval, }; use std::ffi::{c_char, c_int}; @@ -200,11 +201,13 @@ extern "C" fn dump_named_variadic_args( } } extern "C" fn zpp_testing(execute_data: *mut zend_execute_data, return_value: *mut zval) { + // Types are needed to make sure that integer sizes are correct, otherwise + // rust will use 4 bytes for the long, but php expects 8 bytes let mut bool_val = true; let mut nullable_bool_val = true; let mut nullable_bool_null = false; - let mut long_val = 1; - let mut nullable_long_val = 1; + let mut long_val: zend_long = 1; + let mut nullable_long_val: zend_long = 1; let mut nullable_long_null = false; let mut double_val = 1.0; let mut nullable_double_val = 1.0; diff --git a/example/rust-ext-demo/tests/zpp.phpt b/example/rust-ext-demo/tests/zpp.phpt index 46728d1..b006f08 100644 --- a/example/rust-ext-demo/tests/zpp.phpt +++ b/example/rust-ext-demo/tests/zpp.phpt @@ -64,22 +64,22 @@ string(107) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null, string(107) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" string(96) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null" string(96) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null" -string(104) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" -string(104) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" -string(93) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null" -string(93) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null" -string(108) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" -string(108) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" -string(97) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" -string(97) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" -string(103) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" -string(103) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" -string(92) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null" -string(92) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null" -string(107) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" -string(107) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" -string(96) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null" -string(96) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null" +string(107) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" +string(107) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" +string(96) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null" +string(96) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null" +string(111) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" +string(111) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" +string(100) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" +string(100) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" +string(106) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" +string(106) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" +string(95) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null" +string(95) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null" +string(110) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" +string(110) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" +string(99) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null" +string(99) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null" string(103) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" string(103) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" string(92) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=12.34, string=foo, ?string=null" @@ -96,21 +96,21 @@ string(106) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null, string(106) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" string(95) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null" string(95) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null" -string(103) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" -string(103) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" -string(92) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null" -string(92) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null" -string(107) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" -string(107) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" -string(96) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" -string(96) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" -string(102) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" -string(102) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" -string(91) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null" -string(91) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null" -string(106) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" -string(106) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" -string(95) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null" -string(95) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null" +string(106) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" +string(106) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z" +string(95) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null" +string(95) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null" +string(110) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" +string(110) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z" +string(99) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" +string(99) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null" +string(105) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" +string(105) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z" +string(94) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null" +string(94) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null" +string(109) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" +string(109) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z" +string(98) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null" +string(98) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null" array(0) { }