Skip to content

Tmp2 #16

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

Closed
wants to merge 7 commits into from
Closed

Tmp2 #16

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23ffbd9
Fix #97836: Segfault in concat_function
nielsdos Dec 4, 2022
8ab19f7
Add regression tests for bug #79836
nielsdos Dec 7, 2022
b9beac5
Add regression test for bug #81705
nielsdos Dec 8, 2022
4434e87
Add an additional test for concat_function for interned strings
nielsdos Dec 7, 2022
73526db
Add an additional test for concat_function for non-interned strings
nielsdos Dec 9, 2022
41d2524
Fix after rebase
nielsdos May 12, 2023
c6a6189
Simplify and comment
nielsdos May 13, 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
Prev Previous commit
Next Next commit
Fix after rebase
  • Loading branch information
@nielsdos
nielsdos committed May 12, 2023
commit 41d2524e98ff7fac4432a5160ea6b252ea37f8f0
2 changes: 1 addition & 1 deletion Zend/zend_operators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2033,7 +2033,7 @@ ZEND_API zend_result ZEND_FASTCALL concat_function(zval *result, zval *op1, zval
size_t op2_len = ZSTR_LEN(op2_string);
size_t result_len = op1_len + op2_len;
zend_string *result_str;
uint32_t flags = ZSTR_GET_COPYABLE_CONCAT_PROPERTIES_BOTH(Z_STR_P(op1), Z_STR_P(op2));
uint32_t flags = ZSTR_GET_COPYABLE_CONCAT_PROPERTIES_BOTH(op1_string, op2_string);

if (UNEXPECTED(op1_len > ZSTR_MAX_LEN - op2_len)) {
if (free_op1_string) zend_string_release(op1_string);
Expand Down