cvs: php-src(PHP_5_3) /ext/zlib zlib_filter.c
| From: | Greg Beaver | Date: | Wed, 09 Jan 2008 07:03:28 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/zlib zlib_filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47744@lists.php.net to get a copy of this message | ||
cellog Wed Jan 9 07:03:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zlib zlib_filter.c
Log:
apply same fix of bug #43793 to zlib.deflate
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.4.2.2&r2=1.6.2.2.2.4.2.3&diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.2
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.3
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.2 Wed Jan 9 06:45:36 2008
+++ php-src/ext/zlib/zlib_filter.c Wed Jan 9 07:03:28 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.2 2008/01/09 06:45:36 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.3 2008/01/09 07:03:28 cellog Exp $ */
#include "php.h"
#include "php_zlib.h"
@@ -367,7 +367,7 @@
/* log-2 base of history window (9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) < -MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS) {
+ if (Z_LVAL_PP(tmpzval) < -MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS + 32) {
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);