fix: pgsqlSetNoticeCallback: memory leak

outtersg · outtersg · commit 749223238532 · 2020-01-09T20:29:14.000+01:00
The PostgreSQL-provided message was zvaled and not freed.
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -112,7 +112,9 @@ static void _pdo_pgsql_notice(pdo_dbh_t *dbh, const char *message) /* {{{ */
 		fc->fci.param_count = 1;
 		fc->fci.params = &zarg;
 		fc->fci.retval = &retval;
-		if ((ret = zend_call_function(&fc->fci, &fc->fcc TSRMLS_CC)) == FAILURE) {
+		ret = zend_call_function(&fc->fci, &fc->fcc TSRMLS_CC);
+		zval_ptr_dtor(&zarg);
+		if (ret == FAILURE) {
 			pdo_raise_impl_error(dbh, NULL, "HY000", "could not call user-supplied function" TSRMLS_CC);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,9 @@ static void _pdo_pgsql_notice(pdo_dbh_t dbh, const char message) /* {{{ */`
`112`	`112`	`fc->fci.param_count = 1;`
`113`	`113`	`fc->fci.params = &zarg;`
`114`	`114`	`fc->fci.retval = &retval;`
`115`		`- if ((ret = zend_call_function(&fc->fci, &fc->fcc TSRMLS_CC)) == FAILURE) {`
	`115`	`+ ret = zend_call_function(&fc->fci, &fc->fcc TSRMLS_CC);`
	`116`	`+ zval_ptr_dtor(&zarg);`
	`117`	`+ if (ret == FAILURE) {`
`116`	`118`	`pdo_raise_impl_error(dbh, NULL, "HY000", "could not call user-supplied function" TSRMLS_CC);`
`117`	`119`	`}`
`118`	`120`	`}`