Commit 5d86b6c

committed

Fix GH-19942: avoid infinite loop when using iterator_count() on an empty SplFileObject

1 parent 68d5ddb commit 5d86b6cCopy full SHA for 5d86b6c

File tree

+32

-0

lines changed

+32

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ PHP NEWS`
`27`	`27`	`of the curl_copy_handle() function to clone a CurlHandle. (timwolla)`
`28`	`28`	`. Fix curl build failure on macOS+curl 8.16. (nielsdos)`
`29`	`29`
	`30`	`+- SPL:`
	`31`	`+ . Fixed bug GH-19942 (iterator_count() on an empty SplFileObject looping`
	`32`	`+ infinitely). (alexandre-daubois)`
	`33`	`+`
`30`	`34`	`- Soap:`
`31`	`35`	`. Fixed bug GH-19784 (SoapServer memory leak). (nielsdos)`
`32`	`36`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2166,6 +2166,21 @@ PHP_METHOD(SplFileObject, valid)`
`2166`	`2166`	`if (!intern->u.file.stream) {`
`2167`	`2167`	`RETURN_FALSE;`
`2168`	`2168`	`}`
	`2169`	`+`
	`2170`	`+ /* For empty files, php_stream_eof() might not return TRUE until after a read attempt.`
	`2171`	`+ * If we're at the beginning and haven't read anything, check EOF directly after ensuring`
	`2172`	`+ * a read has been attempted. */`
	`2173`	`+ if (!intern->u.file.current_line && Z_ISUNDEF(intern->u.file.current_zval) &&`
	`2174`	`+ intern->u.file.current_line_num == 0) {`
	`2175`	`+`
	`2176`	`+ zend_off_t pos = php_stream_tell(intern->u.file.stream);`
	`2177`	`+ if (php_stream_getc(intern->u.file.stream) == EOF) {`
	`2178`	`+ RETURN_FALSE;`
	`2179`	`+ }`
	`2180`	`+`
	`2181`	`+ php_stream_seek(intern->u.file.stream, pos, SEEK_SET);`
	`2182`	`+ }`
	`2183`	`+`
`2169`	`2184`	`RETURN_BOOL(!php_stream_eof(intern->u.file.stream));`
`2170`	`2185`	`} /* }}} */`
`2171`	`2186`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+--TEST--`
	`2`	`+GH-19942 (iterator_count() on an empty SplFileObject should return 0)`
	`3`	`+--FILE--`
	`4`	`+<?php`
	`5`	`+touch("/tmp/empty");`
	`6`	`+var_dump(iterator_count(new SplFileObject("/tmp/empty", "r")));`
	`7`	`+?>`
	`8`	`+--CLEAN--`
	`9`	`+<?php`
	`10`	`+unlink("/tmp/empty");`
	`11`	`+?>`
	`12`	`+--EXPECT--`
	`13`	`+int(0)`

Comments

(0)