tony2001 Thu Apr 13 18:14:14 2006 UTC
Modified files:
/php-src/main/streams filter.c
Log:
fix CS and prevent NULL dereference
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/filter.c?r1=1.30&r2=1.31&diff_format=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.30 php-src/main/streams/filter.c:1.31
--- php-src/main/streams/filter.c:1.30 Thu Apr 13 04:41:08 2006
+++ php-src/main/streams/filter.c Thu Apr 13 18:14:14 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.30 2006/04/13 04:41:08 pollita Exp $ */
+/* $Id: filter.c,v 1.31 2006/04/13 18:14:14 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -338,10 +338,12 @@
if (filter == NULL) {
/* TODO: these need correct docrefs */
- if (factory == NULL)
+ if (factory == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to
locate filter \"%s\"", filtername);
- else
+ } else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to
create or locate filter \"%s\"", filtername);
+ }
+ return NULL;
}
filter->name = pestrdup(filtername, filter->is_persistent);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
