cvs: php-src /ext/posix posix.c

tony2001 Thu Dec 21 01:00:39 2006 UTC Modified files: /php-src/ext/posix posix.c Log: fix possible leaks http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.82&r2=1.83&diff_format=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.82 php-src/ext/posix/posix.c:1.83 --- php-src/ext/posix/posix.c:1.82 Thu Dec 7 01:41:29 2006 +++ php-src/ext/posix/posix.c Thu Dec 21 01:00:39 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.82 2006/12/07 01:41:29 iliaa Exp $ */ +/* $Id: posix.c,v 1.83 2006/12/21 01:00:39 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -147,7 +147,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.82 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.83 $"); php_info_print_table_end(); } /* }}} */ @@ -845,6 +845,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #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 @@ 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 @@ 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 @@ 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; + } } } /* }}} */