@@ -194,8 +194,8 @@ static ZEND_INI_MH(OnUpdateMaxAllowedStackSize) /* {{{ */
194194 zend_long size = zend_ini_parse_quantity_warn (new_value , entry -> name );
195195
196196 if (size < ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED ) {
197- zend_error (E_WARNING , "Invalid \"%s \" setting. Value must be >= %d, but got " ZEND_LONG_FMT ,
198- ZSTR_VAL ( entry -> name ) , ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED , size );
197+ zend_error (E_WARNING , "Invalid \"%pS \" setting. Value must be >= %d, but got " ZEND_LONG_FMT ,
198+ entry -> name , ZEND_MAX_ALLOWED_STACK_SIZE_UNCHECKED , size );
199199 return FAILURE ;
200200 }
201201
@@ -228,8 +228,8 @@ static ZEND_INI_MH(OnUpdateReservedStackSize) /* {{{ */
228228 if (size == 0 ) {
229229 size = min ;
230230 } else if (size < min ) {
231- zend_error (E_WARNING , "Invalid \"%s \" setting. Value must be >= " ZEND_ULONG_FMT ", but got " ZEND_ULONG_FMT "\n" ,
232- ZSTR_VAL ( entry -> name ) , min , size );
231+ zend_error (E_WARNING , "Invalid \"%pS \" setting. Value must be >= " ZEND_ULONG_FMT ", but got " ZEND_ULONG_FMT "\n" ,
232+ entry -> name , min , size );
233233 return FAILURE ;
234234 }
235235
@@ -1833,7 +1833,7 @@ ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const c
18331833 if (EG (current_execute_data ) && !CG (in_compilation )) {
18341834 zend_throw_exception_ex (exception_ce , 0 , "%pS" , message );
18351835 } else {
1836- zend_error_noreturn (E_ERROR , "%s " , ZSTR_VAL ( message ) );
1836+ zend_error_noreturn (E_ERROR , "%pS " , message );
18371837 }
18381838
18391839 zend_string_release (message );
@@ -1854,12 +1854,12 @@ ZEND_API ZEND_COLD void zend_illegal_container_offset(const zend_string *contain
18541854 if (zend_string_equals (container , ZSTR_KNOWN (ZEND_STR_STRING ))) {
18551855 zend_throw_error (NULL , "Cannot unset string offsets" );
18561856 } else {
1857- zend_type_error ("Cannot unset offset of type %s on %s " , zend_zval_type_name (offset ), ZSTR_VAL ( container ) );
1857+ zend_type_error ("Cannot unset offset of type %s on %pS " , zend_zval_type_name (offset ), container );
18581858 }
18591859 return ;
18601860 default :
1861- zend_type_error ("Cannot access offset of type %s on %s " ,
1862- zend_zval_type_name (offset ), ZSTR_VAL ( container ) );
1861+ zend_type_error ("Cannot access offset of type %s on %pS " ,
1862+ zend_zval_type_name (offset ), container );
18631863 return ;
18641864 }
18651865}
0 commit comments