PdoPgsql::setNoticeCallback(): theorical memory leak

c265b90#r142275842
Redefines PDO_CONSTRUCT_CHECK to make room for an optional cleanup

Author: outtersg

ext/pdo/php_pdo.h

@@ -55,11 +55,22 @@ PHP_MINFO_FUNCTION(pdo);
 
 #define LONG_CONST(c) (zend_long) c
 
+#define PDO_CONSTRUCT_CHECK_COND dbh->driver
+#define PDO_CONSTRUCT_CHECK_FAIL \
+		zend_throw_error(NULL, "%s object is uninitialized", ZSTR_VAL(Z_OBJ(EX(This))->ce->name));
+
 #define PDO_CONSTRUCT_CHECK \
-	if (!dbh->driver) { \
-		zend_throw_error(NULL, "%s object is uninitialized", ZSTR_VAL(Z_OBJ(EX(This))->ce->name)); \
+	if (!(PDO_CONSTRUCT_CHECK_COND)) { \
+		PDO_CONSTRUCT_CHECK_FAIL \
 		RETURN_THROWS(); \
 	} \
 
 
+#define PDO_CONSTRUCT_CHECK_WITH_CLEANUP(cleanup) \
+	if (!(PDO_CONSTRUCT_CHECK_COND)) { \
+		PDO_CONSTRUCT_CHECK_FAIL \
+		goto cleanup; \
+	} \
+
+
 #endif	/* PHP_PDO_H */

ext/pdo_pgsql/pgsql_driver.c

@@ -1252,7 +1252,7 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlSetNoticeCallback)
 	}
 
 	pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS);
-	PDO_CONSTRUCT_CHECK;
+	PDO_CONSTRUCT_CHECK_WITH_CLEANUP(cleanup);
 
 	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
 
@@ -1262,6 +1262,14 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlSetNoticeCallback)
 		H->notice_callback = emalloc(sizeof(zend_fcall_info_cache));
 		zend_fcc_dup(H->notice_callback, &fcc);
 	}
+
+	return;
+
+cleanup:
+	if (ZEND_FCC_INITIALIZED(fcc)) {
+		zend_fcc_dtor(&fcc);
+	}
+	RETURN_THROWS();
 }
 /* }}} */