moriyoshi Tue Jul 20 14:04:36 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard filters.c
Log:
- MFH (filters.c: 1.40): pemalloc() might return NULL
http://cvs.php.net/diff.php/php-src/ext/standard/filters.c?r1=1.38.2.1&r2=1.38.2.2&ty=u
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.38.2.1 php-src/ext/standard/filters.c:1.38.2.2
--- php-src/ext/standard/filters.c:1.38.2.1 Fri Jul 16 19:42:00 2004
+++ php-src/ext/standard/filters.c Tue Jul 20 14:04:36 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filters.c,v 1.38.2.1 2004/07/16 23:42:00 pollita Exp $ */
+/* $Id: filters.c,v 1.38.2.2 2004/07/20 18:04:36 moriyoshi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -176,7 +176,9 @@
static int php_strip_tags_filter_ctor(php_strip_tags_filter *inst, const char
*allowed_tags, int allowed_tags_len, int persistent)
{
if (allowed_tags != NULL) {
- inst->allowed_tags = pemalloc(allowed_tags_len, persistent);
+ if (NULL != (inst->allowed_tags = pemalloc(allowed_tags_len,
persistent))) {
+ return FAILURE;
+ }
memcpy((char *)inst->allowed_tags, allowed_tags, allowed_tags_len);
inst->allowed_tags_len = allowed_tags_len;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
