php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source
This commit is contained in:
Jakub Zelenka
2023-09-08 11:00:14 +01:00
parent 6fac4d0ff2 64ebadcac5
commit e04ddb32c8
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/standard/file.c
View File

@@ -2023,6 +2023,9 @@ PHPAPI HashTable *php_fgetcsv(php_stream *stream, char delimiter, char enclosure
if (bptr > limit) {
/* if the line ends with enclosure, we need to go back by
* one character so the \0 character is not copied. */
if (hunk_begin == bptr) {
--hunk_begin;
}
--bptr;
}
goto quit_loop_2;
@@ -2038,6 +2041,9 @@ PHPAPI HashTable *php_fgetcsv(php_stream *stream, char delimiter, char enclosure
if (bptr > limit) {
/* if the line ends with enclosure, we need to go back by
* one character so the \0 character is not copied. */
if (hunk_begin == bptr) {
--hunk_begin;
}
--bptr;
}
goto quit_loop_2;

14
ext/standard/tests/strings/gh12151.phpt Normal file
View File

@@ -0,0 +1,14 @@
--TEST--
GH-12151 (str_getcsv ending with escape zero segfualt)
--FILE--
<?php
var_export(str_getcsv("y","","y","\000"));
var_export(str_getcsv("\0yy","y","y","\0"));
?>
--EXPECT--
array (
0 => '' . "\0" . '',
)array (
0 => '' . "\0" . '',
1 => '' . "\0" . '',
)