com php-src: Fixed segfault: ext/pgsql/pgsql.c
| From: | Xinchen Hui | Date: | Mon, 19 May 2014 06:44:59 +0000 |
| Subject: | com php-src: Fixed segfault: ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78459@lists.php.net to get a copy of this message | ||
Commit: ed554704f3d50768653bbb0c17cc7b47e08dc790
Author: Xinchen Hui <laruence@php.net> Mon, 19 May 2014 14:44:59 +0800
Parents: 1ff7c7b9a31bd3242b06436740322f7246a708f0
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed554704f3d50768653bbb0c17cc7b47e08dc790
Log:
Fixed segfault
Changed paths:
M ext/pgsql/pgsql.c
Diff:
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index c6843c2..5790310 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -983,7 +983,6 @@ static void _php_pgsql_notice_ptr_dtor(zval *el)
if (notice) {
efree(notice->message);
efree(notice);
- notice = NULL;
}
}
/* }}} */
@@ -1273,8 +1272,10 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int
persistent)
int i, connect_type = 0;
PGresult *pg_result;
+ args = (zval *)safe_emalloc(ZEND_NUM_ARGS(), sizeof(zval), 0);
if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 5
|| zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
+ efree(args);
WRONG_PARAM_COUNT;
}
@@ -1318,6 +1319,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
break;
}
}
+ efree(args);
if (persistent && PGG(allow_persistent)) {
zend_resource *le;