cvs: php4 /ext/standard filters.c
| From: | Moriyoshi Koizumi | Date: | Wed, 16 Apr 2003 14:55:25 +0000 |
| Subject: | cvs: php4 /ext/standard filters.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20323@lists.php.net to get a copy of this message | ||
moriyoshi Wed Apr 16 10:55:25 2003 EDT
Modified files:
/php4/ext/standard filters.c
Log:
Added missing sanity check
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.31 php4/ext/standard/filters.c:1.32
--- php4/ext/standard/filters.c:1.31 Wed Apr 16 10:30:25 2003
+++ php4/ext/standard/filters.c Wed Apr 16 10:55:25 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filters.c,v 1.31 2003/04/16 14:30:25 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.32 2003/04/16 14:55:25 moriyoshi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1661,16 +1661,17 @@
char *dot;
int conv_mode;
+ if (filterparams != NULL && Z_TYPE_P(filterparams) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "stream filter (%s): invalid filter
parameter", filtername);
+ return NULL;
+ }
+
if ((dot = strchr(filtername, '.')) == NULL) {
return NULL;
}
++dot;
inst = pemalloc(sizeof(php_convert_filter), persistent);
-
- if (Z_TYPE_P(filterparams) != IS_ARRAY) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "stream filter (%s): invalid filter
parameter", filtername);
- }
if (strcasecmp(dot, "base64-encode") == 0) {
conv_mode = PHP_CONV_BASE64_ENCODE;