From 457f22c19823aea93f95cd0be0d17667ba741dda Mon Sep 17 00:00:00 2001
From: Sterling Hughes <sterling@php.net>
Date: Thu, 26 Dec 2002 20:52:42 +0000
Subject: [PATCH] if needle is empty free allocated memory

---
 ext/standard/string.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/standard/string.c b/ext/standard/string.c
index f450e2a720b..d5defdc253a 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1352,6 +1352,9 @@ PHP_FUNCTION(stristr)
 	if (Z_TYPE_PP(needle) == IS_STRING) {
 		if (!Z_STRLEN_PP(needle)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
+			efree(haystack_orig);
+			zval_ptr_dtor(haystack);
+			zval_ptr_dtor(needle);
 			RETURN_FALSE;
 		}