|
 |
b74969 |
Adapted for 5.4, binary patch removed, from:
|
|
|
b74969 |
|
|
|
b74969 |
|
|
|
b74969 |
From f3feddb5b45b5abd93abb1a95044b7e099d51c84 Mon Sep 17 00:00:00 2001
|
|
|
b74969 |
From: Stanislav Malyshev <stas@php.net>
|
|
|
b74969 |
Date: Mon, 18 Jul 2016 22:20:45 -0700
|
|
|
b74969 |
Subject: [PATCH] Partial fix for bug #72613 - do not treat negative returns
|
|
|
b74969 |
from bz2 as size_t
|
|
|
b74969 |
|
|
|
b74969 |
---
|
|
|
b74969 |
ext/bz2/bz2.c | 80 +++++++++++++++++++++++---------------------
|
|
|
b74969 |
ext/bz2/tests/72613.bz2 | Bin 0 -> 351 bytes
|
|
|
b74969 |
ext/bz2/tests/bug72613.phpt | 23 +++++++++++++
|
|
|
b74969 |
3 files changed, 65 insertions(+), 38 deletions(-)
|
|
|
b74969 |
create mode 100644 ext/bz2/tests/72613.bz2
|
|
|
b74969 |
create mode 100644 ext/bz2/tests/bug72613.phpt
|
|
|
b74969 |
|
|
|
b74969 |
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
|
|
|
b74969 |
index de3250e..7cfcaa8 100644
|
|
|
b74969 |
--- a/ext/bz2/bz2.c
|
|
|
b74969 |
+++ b/ext/bz2/bz2.c
|
|
|
b74969 |
@@ -137,16 +137,20 @@ struct php_bz2_stream_data_t {
|
|
|
b74969 |
static size_t php_bz2iop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
|
|
|
b74969 |
{
|
|
|
b74969 |
struct php_bz2_stream_data_t *self = (struct php_bz2_stream_data_t *) stream->abstract;
|
|
|
b74969 |
- size_t ret;
|
|
|
b74969 |
-
|
|
|
b74969 |
- ret = BZ2_bzread(self->bz_file, buf, count);
|
|
|
b74969 |
+ int bz2_ret;
|
|
|
b74969 |
+
|
|
|
b74969 |
+ bz2_ret = BZ2_bzread(self->bz_file, buf, count);
|
|
|
b74969 |
|
|
|
b74969 |
- if (ret == 0) {
|
|
|
b74969 |
+ if (bz2_ret < 0) {
|
|
|
b74969 |
+ stream->eof = 1;
|
|
|
b74969 |
+ return -1;
|
|
|
b74969 |
+ }
|
|
|
b74969 |
+ if (bz2_ret == 0) {
|
|
|
b74969 |
stream->eof = 1;
|
|
|
b74969 |
}
|
|
|
b74969 |
|
|
|
b74969 |
- return ret;
|
|
|
b74969 |
+ return (size_t)bz2_ret;
|
|
|
b74969 |
}
|
|
|
b74969 |
|
|
|
b74969 |
static size_t php_bz2iop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
|
|
|
b74969 |
{
|