cvs: php-src(PHP_5_2) /ext/standard user_filters.c
| From: | Antony Dovgal | Date: | Wed, 11 Oct 2006 14:46:40 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/standard user_filters.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41076@lists.php.net to get a copy of this message | ||
tony2001 Wed Oct 11 14:46:40 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard user_filters.c
Log:
MFH: check filter and class names for empty strings
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.1&r2=1.31.2.4.2.2&diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.1
php-src/ext/standard/user_filters.c:1.31.2.4.2.2
--- php-src/ext/standard/user_filters.c:1.31.2.4.2.1 Mon Jun 26 17:23:38 2006
+++ php-src/ext/standard/user_filters.c Wed Oct 11 14:46:40 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.31.2.4.2.1 2006/06/26 17:23:38 bjori Exp $ */
+/* $Id: user_filters.c,v 1.31.2.4.2.2 2006/10/11 14:46:40 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -549,6 +549,16 @@
RETVAL_FALSE;
+ if (!filtername_len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Filter name cannot be empty");
+ return;
+ }
+
+ if (!classname_len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Class name cannot be empty");
+ return;
+ }
+
if (!BG(user_filter_map)) {
BG(user_filter_map) = (HashTable*) emalloc(sizeof(HashTable));
zend_hash_init(BG(user_filter_map), 5, NULL, (dtor_func_t) filter_item_dtor, 0);