Skip to content

Commit 886c298

Browse files
committed
Handle NUL bytes in #[\Deprecated] message
1 parent 782a577 commit 886c298

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--TEST--
2+
#[\Deprecated]: NUL bytes in message.
3+
--FILE--
4+
<?php
5+
6+
#[\Deprecated("Here is a NUL \x00 Byte")]
7+
function test() {
8+
}
9+
10+
test();
11+
12+
?>
13+
--EXPECTF--
14+
Deprecated: Function test() is deprecated, Here is a NUL %0 Byte in %s on line %d

Zend/zend_execute.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,15 +1744,15 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_functi
17441744

17451745
if (message_suffix != NULL) {
17461746
if (fbc->common.scope) {
1747-
zend_error(code, "Method %s::%s() is deprecated, %s",
1747+
zend_error_unchecked(code, "Method %s::%s() is deprecated, %S",
17481748
ZSTR_VAL(fbc->common.scope->name),
17491749
ZSTR_VAL(fbc->common.function_name),
1750-
ZSTR_VAL(message_suffix)
1750+
message_suffix
17511751
);
17521752
} else {
1753-
zend_error(code, "Function %s() is deprecated, %s",
1753+
zend_error_unchecked(code, "Function %s() is deprecated, %S",
17541754
ZSTR_VAL(fbc->common.function_name),
1755-
ZSTR_VAL(message_suffix)
1755+
message_suffix
17561756
);
17571757
}
17581758

0 commit comments

Comments
 (0)