mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Remove zero size special case for copy_to_stream
This commit is contained in:
Nikita Popov 2021-03-29 15:22:50 +02:00
commit 202a701a4e
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/standard/tests/file/stream_copy_to_stream_empty.phpt Normal file
View File

@ -0,0 +1,19 @@
--TEST--
stream_copy_to_stream() from empty file
--FILE--
<?php
$tmp_empty_file = __FILE__ . ".tmp";
file_put_contents($tmp_empty_file, "");
$in = fopen($tmp_empty_file, 'r');
$out = fopen('php://memory', 'w');
var_dump(stream_copy_to_stream($in, $out));
?>
--CLEAN--
<?php
unlink(__FILE__ . ".tmp");
?>
--EXPECT--
int(0)

23
main/streams/streams.c
View File

@ -1539,7 +1539,6 @@ PHPAPI int _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size
size_t haveread = 0;
size_t towrite;
size_t dummy;
php_stream_statbuf ssbuf;
if (!len) {
len = &dummy;
@ -1554,17 +1553,6 @@ PHPAPI int _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size
maxlen = 0;
}
if (php_stream_stat(src, &ssbuf) == 0) {
if (ssbuf.sb.st_size == 0
#ifdef S_ISREG
&& S_ISREG(ssbuf.sb.st_mode)
#endif
) {
*len = 0;
return SUCCESS;
}
}
if (php_stream_mmap_possible(src)) {
char *p;
@ -1641,20 +1629,13 @@ PHPAPI int _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size
writeptr += didwrite;
}
if (maxlen - haveread == 0) {
if (maxlen && maxlen == haveread) {
break;
}
}
*len = haveread;
/* we've got at least 1 byte to read.
* less than 1 is an error */
if (haveread > 0 || src->eof) {
return SUCCESS;
}
return FAILURE;
return SUCCESS;
}
/* Returns the number of bytes moved.