diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-18 15:25:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-22 17:17:28 +0200 |
| commit | d59aac58b3e7da7ad01a194fe9840d89725ea229 (patch) | |
| tree | 5cfc4509f8aa6f9cb0c49df3530fb82c5b0456df /ext/gd/gd.c | |
| parent | c817b8020c8a835946681ca94b9257e78e64dad3 (diff) | |
| download | php-git-d59aac58b3e7da7ad01a194fe9840d89725ea229.tar.gz | |
Report errors from stream read and write operations
The php_stream_read() and php_stream_write() functions now return
an ssize_t value, with negative results indicating failure. Functions
like fread() and fwrite() will return false in that case.
As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams
should not be regarded as error conditions, and be reported as
successful zero-length reads/writes instead. The handling of EINTR
remains unclear and is internally inconsistent (e.g. some code-paths
will automatically retry on EINTR, while some won't).
I'm landing this now to make sure the stream wrapper ops API changes
make it into 7.4 -- however, if the user-facing changes turn out to
be problematic we have the option of clamping negative returns to
zero in php_stream_read() and php_stream_write() to restore the
old behavior in a relatively non-intrusive manner.
Diffstat (limited to 'ext/gd/gd.c')
| -rw-r--r-- | ext/gd/gd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 92adaedf94..fd4a8401c3 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1443,11 +1443,11 @@ PHP_FUNCTION(imageloadfont) */ font = (gdFontPtr) emalloc(sizeof(gdFont)); b = 0; - while (b < hdr_size && (n = php_stream_read(stream, (char*)&font[b], hdr_size - b))) { + while (b < hdr_size && (n = php_stream_read(stream, (char*)&font[b], hdr_size - b)) > 0) { b += n; } - if (!n) { + if (n <= 0) { efree(font); if (php_stream_eof(stream)) { php_error_docref(NULL, E_WARNING, "End of file while reading header"); @@ -1486,11 +1486,11 @@ PHP_FUNCTION(imageloadfont) font->data = emalloc(body_size); b = 0; - while (b < body_size && (n = php_stream_read(stream, &font->data[b], body_size - b))) { + while (b < body_size && (n = php_stream_read(stream, &font->data[b], body_size - b)) > 0) { b += n; } - if (!n) { + if (n <= 0) { efree(font->data); efree(font); if (php_stream_eof(stream)) { |