From: Takeshi Abe <tabe@php.net>
Date: Mon, 19 Jan 2009 16:35:40 +0000 (+0000)
Subject: bump up and use IMAGE_FILTER_MAX_ARGS instead of a magic number.
X-Git-Tag: php-5.4.0alpha1~191^2~4464
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f436bb308719c7d1f7c7baaae4bb4c7e70989a99;p=php

bump up and use IMAGE_FILTER_MAX_ARGS instead of a magic number.
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 06648b0f87..84f1a82ef2 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -114,7 +114,7 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b);
 #define IMAGE_FILTER_SMOOTH         10
 #define IMAGE_FILTER_PIXELATE       11
 #define IMAGE_FILTER_MAX            11
-#define IMAGE_FILTER_MAX_ARGS       5
+#define IMAGE_FILTER_MAX_ARGS       6
 static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS);
 static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS);
 static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS);
@@ -4658,7 +4658,7 @@ PHP_FUNCTION(imagefilter)
 		php_image_filter_pixelate
 	};
 
-	if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 6) {
+	if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > IMAGE_FILTER_MAX_ARGS) {
 		WRONG_PARAM_COUNT;
 	} else if (zend_parse_parameters(2 TSRMLS_CC, "rl", &tmp, &filtertype) == FAILURE) {
 		return;