Fix substr_replace with slots in repl_ht being UNDEF

[nielsdos]

The check that was supposed to check whether the array slot was UNDEF was wrong and never triggered. This resulted in a replacement with the empty string or the wrong string instead of the correct one. The correct check pattern can be observed higher up in the function's code.

EDIT: Appveyor failure due to Bug #48182: ssl handshake fails during asynchronous socket connection [C:\projects\php-src\ext\openssl\tests\bug48182.phpt], which is unrelated

[iluuu1994]

Thank you! On PHP-8.2 there are two such cases.

php-src/ext/standard/string.c

Line 2368 in d0dd77a

if (repl_ht != IS_UNDEF) {

php-src/ext/standard/string.c

Line 2376 in d0dd77a

if (repl_ht != IS_UNDEF) {

However merges this should adjust for both, or it can be done in a follow-up.

[iluuu1994]

Oh, nevermind. It's correct there 😄 Nope, just linked the wrong line 🙂

[nielsdos]

I can do a follow-up if you want. The only "issue" then I guess is that the PHP-8.1 branch will not be a subset of PHP-8.2+ ?

[iluuu1994]

@nielsdos We must merge upstream, so whoever merges this will need to resolve the merge conflict, and thus just adjusting the other line should be ok. Would be nice if we had a test for the unpacked case too, we could probably create an unpacked array like this:

$array = ['foo', 42 => 'bar', 'baz'];
unset($array[42]);

But I haven't tested it.

[nielsdos]

@nielsdos We must merge upstream, so whoever merges this will need to resolve the merge conflict, and thus just adjusting the other line should be ok.

Whoops... of course, that makes sense 😅

Would be nice if we had a test for the unpacked case too, we could probably create an unpacked array like this:

$array = ['foo', 42 => 'bar', 'baz'];
unset($array[42]);

But I haven't tested it.

I'll check tomorrow if this test would work with some good old printf debugging, and add it if that is the case :)

[nielsdos]

Yep your test works, thanks. I updated the test file to include your test.

[iluuu1994]

@nielsdos Perfect, thank you!