com php-src: fixes unsigned < 0 comparsion: ext/bz2/bz2.c
| From: | Anatol Belski | Date: | Sat, 01 Mar 2014 10:30:49 +0000 |
| Subject: | com php-src: fixes unsigned < 0 comparsion: ext/bz2/bz2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76302@lists.php.net to get a copy of this message | ||
Commit: a54d442de1c64875f9d4e04e29022a72d49a5e73
Author: Anatol Belski <ab@php.net> Sat, 1 Mar 2014 11:30:49 +0100
Parents: e6ccba4b146a7cbea87b1a06278e6f0fa511312f
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a54d442de1c64875f9d4e04e29022a72d49a5e73
Log:
fixes unsigned < 0 comparsion
Changed paths:
M ext/bz2/bz2.c
Diff:
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 91d8676..cc763c3 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -346,10 +346,9 @@ static PHP_FUNCTION(bzread)
Z_STRVAL_P(return_value) = emalloc(len + 1);
Z_STRSIZE_P(return_value) = php_stream_read(stream, Z_STRVAL_P(return_value), len);
- if (Z_STRSIZE_P(return_value) < 0) {
+ if (Z_STRSIZE_P(return_value) == 0) {
efree(Z_STRVAL_P(return_value));
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not read valid bz2 data from
stream");
- RETURN_FALSE;
+ RETURN_STRINGL("", 0, 1);
}
Z_STRVAL_P(return_value)[Z_STRSIZE_P(return_value)] = 0;