MFH: Fixed memory leak, when invalid context is specified.

diff --git a/ext/standard/file.c b/ext/standard/file.c
index aaf2359f587885682f6fc40fd8faab00eec4de09..f783c43cac1f4136c710a0975d19d3677f21d133 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -905,10 +905,10 @@ static int parse_context_options(php_stream_context *context, zval *options)
 
 static int parse_context_params(php_stream_context *context, zval *params)
 {
-       int ret = SUCCESS;
+       int ret = FAILURE;
        zval **tmp;
 
-       if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), "notification", sizeof("notification"), (void**)&tmp)) {
+       if ((ret = zend_hash_find(Z_ARRVAL_P(params), "notification", sizeof("notification"), (void**)&tmp)) == SUCCESS) {
                
                if (context->notifier) {
                        php_stream_notification_free(context->notifier);
@@ -920,10 +920,14 @@ static int parse_context_params(php_stream_context *context, zval *params)
                context->notifier->ptr = *tmp;
                ZVAL_ADDREF(*tmp);
        }
-       if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), "options", sizeof("options"), (void**)&tmp)) {
+       if ((ret = zend_hash_find(Z_ARRVAL_P(params), "options", sizeof("options"), (void**)&tmp)) == SUCCESS) {
                parse_context_options(context, *tmp);
        }
-       
+
+       if (ret != SUCCESS) {
+               php_stream_context_free(context);
+       }
+
        return ret;
 }