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

Also report errors from Zend stream reader operation

Browse source
This commit is contained in:
Nikita Popov 2019-07-22 17:49:08 +02:00
parent d59aac58b3
commit 5664035ffe
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Zend/zend_stream.c
View file

@ -25,7 +25,7 @@
ZEND_DLIMPORT int isatty(int fd);
static size_t zend_stream_stdio_reader(void *handle, char *buf, size_t len) /* {{{ */
static ssize_t zend_stream_stdio_reader(void *handle, char *buf, size_t len) /* {{{ */
{
return fread(buf, 1, len, (FILE*)handle);
} /* }}} */
@ -95,7 +95,7 @@ static int zend_stream_getc(zend_file_handle *file_handle) /* {{{ */
return EOF;
} /* }}} */
static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len) /* {{{ */
static ssize_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len) /* {{{ */
{
if (file_handle->handle.stream.isatty) {
int c = '*';
@ -148,10 +148,18 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
}
if (size) {
file_handle->buf = *buf = safe_emalloc(1, size, ZEND_MMAP_AHEAD);
file_handle->len = zend_stream_read(file_handle, *buf, size);
ssize_t read;
*buf = safe_emalloc(1, size, ZEND_MMAP_AHEAD);
read = zend_stream_read(file_handle, *buf, size);
if (read < 0) {
efree(*buf);
return FAILURE;
}
file_handle->buf = *buf;
file_handle->len = read;
} else {
size_t read, remain = 4*1024;
size_t remain = 4*1024;
ssize_t read;
*buf = emalloc(remain);
size = 0;
@ -164,6 +172,11 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t
remain = size;
}
}
if (read < 0) {
efree(*buf);
return FAILURE;
}
file_handle->len = size;
if (size && remain < ZEND_MMAP_AHEAD) {
*buf = safe_erealloc(*buf, size, 1, ZEND_MMAP_AHEAD);

2
Zend/zend_stream.h
View file

@ -29,7 +29,7 @@
* These functions are private to the engine.
* */
typedef size_t (*zend_stream_fsizer_t)(void* handle);
typedef size_t (*zend_stream_reader_t)(void* handle, char *buf, size_t len);
typedef ssize_t (*zend_stream_reader_t)(void* handle, char *buf, size_t len);
typedef void (*zend_stream_closer_t)(void* handle);
#define ZEND_MMAP_AHEAD 32

2
ext/phar/phar.c
View file

@ -3215,7 +3215,7 @@ static const zend_function_entry phar_functions[] = {
};
/* }}}*/
static size_t phar_zend_stream_reader(void *handle, char *buf, size_t len) /* {{{ */
static ssize_t phar_zend_stream_reader(void *handle, char *buf, size_t len) /* {{{ */
{
return php_stream_read(phar_get_pharfp((phar_archive_data*)handle), buf, len);
}