From cc13d8696fbe08561c3b01ef8d29214fa2b09343 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Sat, 7 Feb 2015 19:17:31 +0100
Subject: [PATCH] Fix another invalid free of CG(interned_empty_string)

Fixes #68214
---
 ext/standard/tests/strings/bug68996.phpt | 7 +++++++
 main/main.c                              | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ext/standard/tests/strings/bug68996.phpt b/ext/standard/tests/strings/bug68996.phpt
index 30ba147f8f..af40274983 100644
--- a/ext/standard/tests/strings/bug68996.phpt
+++ b/ext/standard/tests/strings/bug68996.phpt
@@ -10,7 +10,14 @@ html_errors=1
 --FILE--
 <?php
 fopen("\xfc\x63", "r");
+finfo_open(FILEINFO_MIME_TYPE, "\xfc\x63");
 ?>
 --EXPECTF--
 <br />
 <b>Warning</b>:  : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>2</b><br />
+<br />
+<b>Warning</b>:  : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>3</b><br />
+<br />
+<b>Warning</b>:  : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>3</b><br />
+<br />
+<b>Warning</b>:  finfo_open():  in <b>/%sbug68996.php</b> on line <b>3</b><br />
diff --git a/main/main.c b/main/main.c
index 331849cfc2..a98aff0755 100644
--- a/main/main.c
+++ b/main/main.c
@@ -935,7 +935,7 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
 			zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) &tmp, sizeof(zval *), NULL);
 		}
 	}
-	efree(buffer);
+	str_efree(buffer);
 
 	php_error(type, "%s", message);
 	efree(message);
-- 
2.40.0