summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pierre.php@gmail.com>2014-05-16 08:27:21 +0200
committerPierre Joye <pierre.php@gmail.com>2014-05-16 08:27:21 +0200
commit797c1660cbd1e6ed0092ebbb153c9a2dec3054c8 (patch)
tree4d397043b86cabf54cc2fe8cf40719d9847dc54d
parentf28e0b0db7f4804e432fbcd79f0ccbe27983e6e4 (diff)
downloadphp-git-797c1660cbd1e6ed0092ebbb153c9a2dec3054c8.tar.gz
test the right length and remove unused var (remaining from 'old' version)
-rw-r--r--ext/bz2/bz2.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index bd4ac68d1d..db4e834a20 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -346,26 +346,24 @@ static PHP_FUNCTION(bzread)
long len = 1024;
php_stream *stream;
zend_string *data;
- size_t dlen;
-
+
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &bz, &len)) {
RETURN_FALSE;
}
-
+
php_stream_from_zval(stream, bz);
if ((len + 1) < 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "length may not be negative");
RETURN_FALSE;
}
-
data = STR_ALLOC(len, 0);
data->len = php_stream_read(stream, data->val, data->len);
-
- if (dlen < 0) {
+
+ if (data->len < 0) {
STR_FREE(data);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not read valid bz2 data from stream");
- RETURN_FALSE;
+ RETURN_FALSE;
}
data->val[data->len] = '\0';