Commit 5a2a150

committed

Merge branch 'PHP-8.4'

* PHP-8.4: Fix phar crash and file corruption with SplFileObject

2 parents 4d27420 + 2aeefb1 commit 5a2a150Copy full SHA for 5a2a150

File tree

+29

-4

lines changed

+29

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2708,7 +2708,7 @@ void phar_flush_ex(phar_archive_data phar, zend_string user_stub, bool is_defa`
`2708`	`2708`	`/* remove this from the new phar */`
`2709`	`2709`	`continue;`
`2710`	`2710`	`}`
`2711`		`- if (!entry->is_modified&&entry->fp_refcount) {`
	`2711`	`+ if (entry->fp_refcount) {`
`2712`	`2712`	`/* open file pointers refer to this fp, do not free the stream */`
`2713`	`2713`	`switch (entry->fp_type) {`
`2714`	`2714`	`case PHAR_FP:`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -445,12 +445,12 @@ static ssize_t phar_stream_write(php_stream stream, const char buf, size_t cou`
`445`	`445`	`{`
`446`	`446`	`phar_entry_data data = (phar_entry_data ) stream->abstract;`
`447`	`447`
`448`		`- php_stream_seek(data->fp, data->position, SEEK_SET);`
	`448`	`+ php_stream_seek(data->fp, data->position+data->zero, SEEK_SET);`
`449`	`449`	`if (count != php_stream_write(data->fp, buf, count)) {`
`450`	`450`	`php_stream_wrapper_log_error(stream->wrapper, stream->flags, "phar error: Could not write %d characters to \"%s\" in phar \"%s\"", (int) count, ZSTR_VAL(data->internal_file->filename), data->phar->fname);`
`451`	`451`	`return -1;`
`452`	`452`	`}`
`453`		`- data->position = php_stream_tell(data->fp);`
	`453`	`+ data->position = php_stream_tell(data->fp)-data->zero;`
`454`	`454`	`if (data->position > (zend_off_t)data->internal_file->uncompressed_filesize) {`
`455`	`455`	`data->internal_file->uncompressed_filesize = data->position;`
`456`	`456`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -841,7 +841,7 @@ static int phar_tar_writeheaders_int(phar_entry_info entry, void argument) /*`
`841`	`841`	`php_stream_write(fp->new, padding, ((entry->uncompressed_filesize +511)&~511) - entry->uncompressed_filesize);`
`842`	`842`	`}`
`843`	`843`
`844`		`- if (!entry->is_modified&&entry->fp_refcount) {`
	`844`	`+ if (entry->fp_refcount) {`
`845`	`845`	`/* open file pointers refer to this fp, do not free the stream */`
`846`	`846`	`switch (entry->fp_type) {`
`847`	`847`	`case PHAR_FP:`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,25 @@`
	`1`	`+--TEST--`
	`2`	`+GH-19038 (Phar crash and data corruption with SplFileObject)`
	`3`	`+--EXTENSIONS--`
	`4`	`+phar`
	`5`	`+--INI--`
	`6`	`+phar.readonly=0`
	`7`	`+--FILE--`
	`8`	`+<?php`
	`9`	`+`
	`10`	`+$phar = new Phar(__DIR__ . "/gh19038.phar");`
	`11`	`+$phar->addFromString("file", "123");`
	`12`	`+$file = $phar["file"]->openFile();`
	`13`	`+$file->fseek(3);`
	`14`	`+var_dump($file->fwrite("456", 3));`
	`15`	`+$file->fseek(0);`
	`16`	`+echo $file->fread(100);`
	`17`	`+`
	`18`	`+?>`
	`19`	`+--CLEAN--`
	`20`	`+<?php`
	`21`	`+@unlink(__DIR__ . "/gh19038.phar");`
	`22`	`+?>`
	`23`	`+--EXPECT--`
	`24`	`+int(3)`
	`25`	`+123456`

Comments

(0)