From cbadf38682789cb2a4fe8d616311fff79e32d1db Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Thu, 21 Dec 2006 01:00:39 +0000
Subject: [PATCH] fix possible leaks

---
 ext/posix/posix.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 9ab7ac69c5..ed0dd46d17 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -845,6 +845,7 @@ PHP_FUNCTION(posix_getgrnam)
 	array_init(return_value);
 
 	if (!php_posix_group_to_array(g, return_value)) {
+		zval_dtor(return_value);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert posix group to array");
 		RETVAL_FALSE;
 	}
@@ -863,8 +864,8 @@ PHP_FUNCTION(posix_getgrgid)
 	int ret;
 	struct group _g;
 	struct group *retgrptr;
-	int grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-	char *grbuf = emalloc(grbuflen);
+	int grbuflen;
+	char *grbuf;
 #endif
 	struct group *g;
 	
@@ -872,6 +873,10 @@ PHP_FUNCTION(posix_getgrgid)
 		RETURN_FALSE;
 	}
 #ifdef HAVE_GETGRGID_R
+	
+	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+	grbuf = emalloc(grbuflen);
+
 	ret = getgrgid_r(gid, &_g, grbuf, grbuflen, &retgrptr);
 	if (ret) {
 		POSIX_G(last_error) = ret;
@@ -888,6 +893,7 @@ PHP_FUNCTION(posix_getgrgid)
 	array_init(return_value);
 
 	if (!php_posix_group_to_array(g, return_value)) {
+		zval_dtor(return_value);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert posix group struct to array");
 		RETVAL_FALSE;
 	}
@@ -949,6 +955,7 @@ PHP_FUNCTION(posix_getpwnam)
 	array_init(return_value);
 
 	if (!php_posix_passwd_to_array(pw, return_value)) {
+		zval_dtor(return_value);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert posix passwd struct to array");
 		RETVAL_FALSE;
 	}
@@ -966,8 +973,8 @@ PHP_FUNCTION(posix_getpwuid)
 #ifdef HAVE_GETPWUID_R
 	struct passwd _pw;
 	struct passwd *retpwptr = NULL;
-	int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
-	char *pwbuf = emalloc(pwbuflen);
+	int pwbuflen;
+	char *pwbuf;
 	int ret;
 #endif
 	struct passwd *pw;
@@ -976,6 +983,9 @@ PHP_FUNCTION(posix_getpwuid)
 		RETURN_FALSE;
 	}
 #ifdef HAVE_GETPWUID_R
+	pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+	pwbuf = emalloc(pwbuflen);
+
 	ret = getpwuid_r(uid, &_pw, pwbuf, pwbuflen, &retpwptr);
 	if (ret) {
 		POSIX_G(last_error) = ret;
@@ -992,6 +1002,7 @@ PHP_FUNCTION(posix_getpwuid)
 	array_init(return_value);
 
 	if (!php_posix_passwd_to_array(pw, return_value)) {
+		zval_dtor(return_value);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert posix passwd struct to array");
 		RETVAL_FALSE;
 	}
@@ -1109,8 +1120,10 @@ PHP_FUNCTION(posix_getrlimit)
 	array_init(return_value);
 
 	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;
+		}
 	}
 }
 /* }}} */
-- 
2.40.0