From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 25 Jun 2020 14:06:20 +0000 (+0200)
Subject: Fix leaks in cgi strip/highlight mode
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1c6a7a3f2a2ca4fbc90a837d82351cf70109bfb;p=php

Fix leaks in cgi strip/highlight mode
---

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 0dfcdb84ef..9a64e0f903 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -2569,10 +2569,8 @@ parent_loop_end:
 					if (open_file_for_scanning(&file_handle) == SUCCESS) {
 						zend_strip();
 						zend_file_handle_dtor(&file_handle);
-						php_output_teardown();
 					}
-					return SUCCESS;
-					break;
+					goto parent_out;
 				case PHP_MODE_HIGHLIGHT:
 					{
 						zend_syntax_highlighter_ini syntax_highlighter_ini;
@@ -2584,9 +2582,8 @@ parent_loop_end:
 								goto fastcgi_request_done;
 							}
 							zend_file_handle_dtor(&file_handle);
-							php_output_teardown();
 						}
-						return SUCCESS;
+						goto parent_out;
 					}
 					break;
 			}