Skip to content

Fix GH-8121: SplFileObject - seek and key with csv file inconsistent #8138

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 2 commits into from
Closed

Fix GH-8121: SplFileObject - seek and key with csv file inconsistent #8138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19b8138
Fix GH-8121: SplFileObject - seek and key with csv file inconsistent
cmb69 Feb 22, 2022
c142ac1
refactor
cmb69 Feb 28, 2022
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
15 changes: 7 additions & 8 deletions ext/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,11 @@ static int spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesystem_obje
zval retval;

/* 1) use fgetcsv? 2) overloaded call the function, 3) do it directly */
if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_READ_CSV) || intern->u.file.func_getCurr->common.scope != spl_ce_SplFileObject) {
if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_READ_CSV)) {
return spl_filesystem_file_read_csv(intern, intern->u.file.delimiter, intern->u.file.enclosure, intern->u.file.escape, NULL);
}
if (intern->u.file.func_getCurr->common.scope != spl_ce_SplFileObject) {
zend_execute_data *execute_data = EG(current_execute_data);
spl_filesystem_file_free_line(intern);

if (php_stream_eof(intern->u.file.stream)) {
Expand All @@ -1947,12 +1951,7 @@ static int spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesystem_obje
}
return FAILURE;
}
if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_READ_CSV)) {
return spl_filesystem_file_read_csv(intern, intern->u.file.delimiter, intern->u.file.enclosure, intern->u.file.escape, NULL);
} else {
zend_execute_data *execute_data = EG(current_execute_data);
zend_call_method_with_0_params(Z_OBJ_P(this_ptr), Z_OBJCE_P(ZEND_THIS), &intern->u.file.func_getCurr, "getCurrentLine", &retval);
}
zend_call_method_with_0_params(Z_OBJ_P(this_ptr), Z_OBJCE_P(ZEND_THIS), &intern->u.file.func_getCurr, "getCurrentLine", &retval);
if (!Z_ISUNDEF(retval)) {
if (intern->u.file.current_line || !Z_ISUNDEF(intern->u.file.current_zval)) {
intern->u.file.current_line_num++;
Expand Down Expand Up @@ -2739,8 +2738,8 @@ PHP_METHOD(SplFileObject, seek)
}
}
if (line_pos > 0) {
intern->u.file.current_line_num++;
if (!SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_READ_AHEAD)) {
intern->u.file.current_line_num++;
spl_filesystem_file_free_line(intern);
}
}
Expand Down
5 changes: 5 additions & 0 deletions ext/spl/tests/gh8121.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
id,status,on_sale,brand,name,link,meta_title,meta_desc,description
1,2,15,Samsung,M21,samsung-m21,Samsung M21,Samsung M21,Samsung M21
2,2,15,Samsung,M32,samsung-m32,Samsung M32,Samsung M32,Samsung M32
3,2,15,Samsung,M21,samsung-m21,Samsung M21,Samsung M21,Samsung M21
4,2,15,Samsung,M32,samsung-m32,Samsung M32,Samsung M32,Samsung M32
39 changes: 39 additions & 0 deletions ext/spl/tests/gh8121.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--TEST--
GH-8121 (SplFileObject - seek and key with csv file inconsistent)
--FILE--
<?php
$flagss = [
SplFileObject::READ_AHEAD | SplFileObject::READ_CSV | SplFileObject::SKIP_EMPTY | SplFileObject::DROP_NEW_LINE,
SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY | SplFileObject::DROP_NEW_LINE,
SplFileObject::SKIP_EMPTY | SplFileObject::DROP_NEW_LINE,
];
foreach ($flagss as $flags) {
$file = new SplFileObject(__DIR__ . "/gh8121.csv", "r");
echo "flags: $flags\n";
$file->setFlags($flags);
$file->seek(0);
var_dump($file->key());
$file->seek(1);
var_dump($file->key());
$file->seek(2);
var_dump($file->key());
$file->seek(3);
var_dump($file->key());
}
?>
--EXPECT--
flags: 15
int(0)
int(1)
int(2)
int(3)
flags: 7
int(0)
int(1)
int(2)
int(3)
flags: 5
int(0)
int(1)
int(2)
int(3)