archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source
This commit is contained in:
Nikita Popov 2019-09-11 10:32:27 +02:00
commit f10eb9f756
3 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/http_fopen_wrapper.c
View file

@ -91,9 +91,9 @@ static inline void strip_header(char *header_bag, char *lc_header_bag,
) {
char *header_start = header_bag + (lc_header_start - lc_header_bag);
char *lc_eol = strchr(lc_header_start, '\n');
char *eol = header_start + (lc_eol - lc_header_start);
if (lc_eol) {
char *eol = header_start + (lc_eol - lc_header_start);
size_t eollen = strlen(lc_eol);
memmove(lc_header_start, lc_eol+1, eollen);

27
ext/standard/tests/streams/bug78506.phpt Normal file
View file

@ -0,0 +1,27 @@
--TEST--
Bug #78506: Error in a php_user_filter::filter() is not reported
--FILE--
<?php
class MyFilter extends php_user_filter {
public function filter($in, $out, &$consumed, $closing)
{
stream_bucket_make_writeable($in);
return PSFS_ERR_FATAL;
}
}
stream_filter_register('filtername', MyFilter::class);
$source_resource = fopen('php://memory', 'rb+');
fwrite($source_resource, 'Test data');
rewind($source_resource);
stream_filter_prepend($source_resource,'filtername',STREAM_FILTER_READ);
var_dump(stream_copy_to_stream($source_resource, fopen('php://memory', 'wb')));
?>
--EXPECT--
bool(false)

34
main/streams/streams.c
View file

@ -1586,33 +1586,31 @@ PHPAPI int _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size
while(1) {
size_t readchunk = sizeof(buf);
ssize_t didread;
char *writeptr;
if (maxlen && (maxlen - haveread) < readchunk) {
readchunk = maxlen - haveread;
}
didread = php_stream_read(src, buf, readchunk);
if (didread <= 0) {
*len = haveread;
return didread < 0 ? FAILURE : SUCCESS;
}
if (didread > 0) {
/* extra paranoid */
char *writeptr;
towrite = didread;
writeptr = buf;
haveread += didread;
towrite = didread;
writeptr = buf;
haveread += didread;
while (towrite) {
ssize_t didwrite = php_stream_write(dest, writeptr, towrite);
if (didwrite <= 0) {
*len = haveread - (didread - towrite);
return FAILURE;
}
towrite -= didwrite;
writeptr += didwrite;
while (towrite) {
ssize_t didwrite = php_stream_write(dest, writeptr, towrite);
if (didwrite <= 0) {
*len = haveread - (didread - towrite);
return FAILURE;
}
} else {
break;
towrite -= didwrite;
writeptr += didwrite;
}
if (maxlen - haveread == 0) {