master: part of the mbstring bailout fix got lost in a merge
Maintainers usually reply within 1 day
Assessment
- Difficulty
- 2/5
- Estimated time
- 1-3 hours
- Newbie friendliness
- 78/100
Research direction
Read ext/mbstring/libmbfl/mbfl/mbfl_encoding.h and compare the mb_convert_buf_ensure() hunk with PHP-8.6; inspect the referenced merge diff for how it was dropped. Restore the missing test from PHP-8.6 at ext/mbstring/tests/oom_buf_growth.phpt and run that test. Done when master contains the three buffer updates and the test, matching PHP-8.6.
Written by the indexing model from the issue text.
Description
The PHP-8.6 into master merge 9705fda1bb dropped this hunk from mb_convert_buf_ensure() in ext/mbstring/libmbfl/mbfl/mbfl_encoding.h. It also dropped the test ext/mbstring/tests/oom_buf_growth.phpt:
if (!newstr) {
+ /* An earlier growth may have moved the buffer. */
+ buf->out = *out;
+ buf->limit = *limit;
return FAILURE;
}
Both are on PHP-8.6 but missing on master. git diff origin/master origin/PHP-8.6 -- ext/mbstring/libmbfl/mbfl/mbfl_encoding.h shows only this hunk, and git show --remerge-diff 9705fda1bb -- ext/mbstring shows the merge removing it. I'm guessing it was an accident during conflict resolution. Re-applying the three lines and restoring the test from PHP-8.6 should be all that's needed.
- Dominant language
- C
- Stars
- 40.7k
- Forks
- 8.3k
- Avg merge
- 2d 15h
- Merged PRs (30d)
- 155
Getting set up
- No Dockerfile or Docker Compose file
- No pull request template
- Read the contributing guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
More from php/php-src
-
Difficulty 2/5 1-3 hours Newbie friendliness 72/100
Maintainers usually reply within 1 day
-
Case-insensitive substr_compare, ksort, krsort are still locale-dependentPossibly taken A pull request linked to this issue is open or already merged. OpenBug Status: Needs Triage
Difficulty 2/5 1-3 hours Newbie friendliness 73/100
php/php-src#24552 · 1 comment ·
Maintainers usually reply within 1 day
-
HTTP wrapper leaks Location buffer when an empty Location header is followed by another Location headerPossibly taken @bercedev claimed this 2 days ago. OpenBug Category: Streams Status: Verified
Difficulty 2/5 1-3 hours Newbie friendliness 78/100
Maintainers usually reply within 1 day
-
`Time\Duration::__unserialize()` accepts a "negative zero" payload.Possibly taken @TimWolla claimed this today. OpenBug Status: Needs Triage
Difficulty 2/5 1-3 hours Newbie friendliness 71/100
php/php-src#24505 · 2 comments · 1 assignee ·
Maintainers usually reply within 1 day
-
Bug Status: Needs Triage
Difficulty 2/5 1-3 hours Newbie friendliness 64/100
Maintainers usually reply within 1 day
Similar issues
-
category:port-update
Difficulty 2/5 1-3 hours Newbie friendliness 66/100
Maintainers usually reply within 2 days
-
emerge failure MARK mark-unstable media-kit
Difficulty 2/5 1-3 hours Newbie friendliness 82/100
macaroni-os/mark-issues#834 ·
-
Difficulty 2/5 1-3 hours Newbie friendliness 76/100
NVIDIA/open-gpu-kernel-modules#1479 · 2 comments ·
Maintainers usually reply within 1 day
-
Difficulty 2/5 1-3 hours Newbie friendliness 76/100
-
Difficulty 1/5 Under an hour Newbie friendliness 93/100
webarkit/WebARKitLib#107 ·
Maintainers usually reply within 1 day