bjori Sun Apr 13 22:35:27 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams bug44712.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
Fixed bug#44712 (stream_context_set_params segfaults on invalid arguments)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.10&r2=1.58.2.6.2.15.2.11&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.10
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.11
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.10 Mon Mar 10
22:12:36 2008
+++ php-src/ext/standard/streamsfuncs.c Sun Apr 13 22:35:27 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.10 2008/03/10 22:12:36 felipe Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.11 2008/04/13 22:35:27 bjori Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -901,7 +901,11 @@
context->notifier->dtor = user_space_stream_notifier_dtor;
}
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), "options",
sizeof("options"), (void**)&tmp)) {
- parse_context_options(context, *tmp);
+ if (Z_TYPE_PP(tmp) == IS_ARRAY) {
+ parse_context_options(context, *tmp);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
stream/context parameter");
+ }
}
return ret;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug44712.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/bug44712.phpt
+++ php-src/ext/standard/tests/streams/bug44712.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
