From: Antony Dovgal <tony2001@php.net>
Date: Thu, 21 Dec 2006 01:03:54 +0000 (+0000)
Subject: MFH fix leaks on errors
X-Git-Tag: php-4.4.5RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55ff6ffa9702f928e191912a0dea3245fc4c0a7b;p=php

MFH fix leaks on errors
---

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index b3a552a6ef..4744284890 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -822,6 +822,7 @@ PHP_FUNCTION(posix_getgrnam)
 	}
 
 	if (!php_posix_group_to_array(g, return_value)) {
+		zval_dtor(return_value);
 		php_error(E_WARNING, "%s() unable to convert posix group to array",
 				  get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
@@ -853,6 +854,7 @@ PHP_FUNCTION(posix_getgrgid)
 	}
 
 	if (!php_posix_group_to_array(g, return_value)) {
+		zval_dtor(return_value);
 		php_error(E_WARNING, "%s() unable to convert posix group struct to array",
 				  get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
@@ -898,6 +900,7 @@ PHP_FUNCTION(posix_getpwnam)
 	}
 
 	if (!php_posix_passwd_to_array(pw, return_value)) {
+		zval_dtor(return_value);
 		php_error(E_WARNING, "%s() unable to convert posix passwd struct to array",
 				  get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
@@ -927,6 +930,7 @@ PHP_FUNCTION(posix_getpwuid)
 	}
 
 	if (!php_posix_passwd_to_array(pw, return_value)) {
+		zval_dtor(return_value);
 		php_error(E_WARNING, "%s() unable to convert posix passwd struct to array",
 				  get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
@@ -1046,8 +1050,10 @@ PHP_FUNCTION(posix_getrlimit)
 	}
 
 	for (l=limits; l->name; l++) {
-		if (posix_addlimit(l->limit, l->name, return_value TSRMLS_CC) == FAILURE)
+		if (posix_addlimit(l->limit, l->name, return_value TSRMLS_CC) == FAILURE) {
+			zval_dtor(return_value);
 			RETURN_FALSE;
+		}
 	}
 }
 /* }}} */