(php_execute_script) fix leak for phpinfo() images.

# maybe the activate/deactivate should be moved outside php_execute_script()?

diff --git a/main/main.c b/main/main.c
index 5212b6cbe09c84362e10731e2a47b74d56ad7a47..aacdc87196fc165b2855727d1b9c2d8941a3a32e 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1156,17 +1156,21 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
                if (!strcmp(SG(request_info).query_string+1, PHP_LOGO_GUID)) {
                        sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1);
                        PHPWRITE(php_logo, sizeof(php_logo));
+                       zend_deactivate_modules();
                        return;
                } else if (!strcmp(SG(request_info).query_string+1, PHP_EGG_LOGO_GUID)) {
                        sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1);
                        PHPWRITE(php_egg_logo, sizeof(php_egg_logo));
+                       zend_deactivate_modules();
                        return;
                } else if (!strcmp(SG(request_info).query_string+1, ZEND_LOGO_GUID)) {
                        sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1);
                        PHPWRITE(zend_logo, sizeof(zend_logo));
+                       zend_deactivate_modules();
                        return;
                } else if (!strcmp(SG(request_info).query_string+1, "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000")) {
                        php_print_credits(PHP_CREDITS_ALL);
+                       zend_deactivate_modules();
                        return;
                }
        }