MFH

diff --git a/main/streams/memory.c b/main/streams/memory.c
index d2b2070477e175e3d623b8de86e9e13d00aa3578..8d7247c7d70e3f8b379cfbe5195302b0949685cb 100644 (file)
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -688,6 +688,7 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, cha
                ts->mode = mode && mode[0] == 'r' ? TEMP_STREAM_READONLY : 0;
                ts->meta = meta;
        }
+       efree(comma);
 
        return stream;
 }

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index f8a81080e2b0dc3ce74d68139e212eb63dcf8e9c..d71f9e5eff4aafb70ec24b16c3ace424be548595 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -474,6 +474,12 @@ static void cli_register_file_handles(TSRMLS_D)
        s_err = php_stream_open_wrapper_ex("php://stderr", "wb", 0, NULL, sc_err);
 
        if (s_in==NULL || s_out==NULL || s_err==NULL) {
+               FREE_ZVAL(zin);
+               FREE_ZVAL(zout);
+               FREE_ZVAL(zerr);
+               if (s_in) php_stream_close(s_in);
+               if (s_out) php_stream_close(s_out);
+               if (s_err) php_stream_close(s_err);
                return;
        }