From: Nikita Popov <nikic@php.net>
Date: Thu, 14 Jul 2016 20:01:13 +0000 (+0200)
Subject: Fix leak in intl collator compare function
X-Git-Tag: php-7.1.0beta1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=267c525820a46a45aec05f1963978fdfe1ae291f;p=php

Fix leak in intl collator compare function
---

diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c
index 69629558d1..4fc5f6a8e8 100644
--- a/ext/intl/collator/collator_sort.c
+++ b/ext/intl/collator/collator_sort.c
@@ -76,7 +76,8 @@ static int collator_regular_compare_function(zval *result, zval *op1, zval *op2)
 			intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ),
 				"Object not initialized", 0 );
 			zend_throw_error(NULL, "Object not initialized");
-			return FAILURE;
+			rc = FAILURE;
+			goto cleanup;
 		}
 
 		/* Compare the strings using ICU. */
@@ -126,6 +127,7 @@ static int collator_regular_compare_function(zval *result, zval *op1, zval *op2)
 		zval_ptr_dtor( norm2_p );
 	}
 
+cleanup:
 	if( num1_p )
 		zval_ptr_dtor( num1_p );