cvs: php-src /ext/zlib zlib_filter.c

From: Date: Tue, 22 Nov 2005 22:08:22 +0000
Subject: cvs: php-src /ext/zlib zlib_filter.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-35314@lists.php.net to get a copy of this message
pollita Tue Nov 22 17:08:22 2005 EDT Modified files: /php-src/ext/zlib zlib_filter.c Log: MFB (r-1.6.2.1) http://cvs.php.net/diff.php/php-src/ext/zlib/zlib_filter.c?r1=1.7&r2=1.8&ty=u Index: php-src/ext/zlib/zlib_filter.c diff -u php-src/ext/zlib/zlib_filter.c:1.7 php-src/ext/zlib/zlib_filter.c:1.8 --- php-src/ext/zlib/zlib_filter.c:1.7 Thu Aug 11 19:36:02 2005 +++ php-src/ext/zlib/zlib_filter.c Tue Nov 22 17:08:22 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib_filter.c,v 1.7 2005/08/11 23:36:02 andrei Exp $ */ +/* $Id: zlib_filter.c,v 1.8 2005/11/22 22:08:22 pollita Exp $ */ #include "php.h" #include "php_zlib.h" @@ -320,7 +320,7 @@ data->strm.data_type = Z_ASCII; if (strcasecmp(filtername, "zlib.inflate") == 0) { - int windowBits = MAX_WBITS; + int windowBits = -MAX_WBITS; if (filterparams) { zval **tmpzval; @@ -330,7 +330,7 @@ /* log-2 base of history window (9 - 15) */ SEPARATE_ZVAL(tmpzval); convert_to_long_ex(tmpzval); - if (Z_LVAL_PP(tmpzval) < 9 || Z_LVAL_PP(tmpzval) > MAX_WBITS) { + if (Z_LVAL_PP(tmpzval) < -MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL_PP(tmpzval)); } else { windowBits = Z_LVAL_PP(tmpzval); @@ -345,7 +345,7 @@ } else if (strcasecmp(filtername, "zlib.deflate") == 0) { /* RFC 1951 Deflate */ int level = Z_DEFAULT_COMPRESSION; - int windowBits = MAX_WBITS; + int windowBits = -MAX_WBITS; int memLevel = MAX_MEM_LEVEL; @@ -374,7 +374,7 @@ /* log-2 base of history window (9 - 15) */ SEPARATE_ZVAL(tmpzval); convert_to_long_ex(tmpzval); - if (Z_LVAL_PP(tmpzval) < 9 || Z_LVAL_PP(tmpzval) > MAX_WBITS) { + if (Z_LVAL_PP(tmpzval) < -MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL_PP(tmpzval)); } else { windowBits = Z_LVAL_PP(tmpzval);

« previous php.cvs (#35314) next »