Get rid of memory leak, improve default connection handling, fix a few tests

Author: kocsismate

ext/pgsql/pgsql.c

@@ -78,7 +78,7 @@
 		zend_throw_error(NULL, "No PostgreSQL connection opened yet"); \
 		RETURN_THROWS(); \
 	}
-#define FETCH_DEFAULT_LINK() (PGG(default_link) ? pgsql_link_from_obj(Z_OBJ_P(PGG(default_link))) : NULL)
+#define FETCH_DEFAULT_LINK() PGG(default_link)
 
 #define CHECK_PGSQL_LINK(link_handle) \
 	if (link_handle->conn == NULL) { \
@@ -290,10 +290,8 @@ static inline char * _php_pgsql_trim_result(PGconn * pgsql, char **buf)
 		efree(msgbuf);													\
 } \
 
-static void php_pgsql_set_default_link(zval *link)
+static void php_pgsql_set_default_link(pgsql_link_handle *link)
 {
-	GC_ADDREF(Z_OBJ_P(link));
-
 	if (PGG(default_link) != NULL) {
 		pgsql_link_free(FETCH_DEFAULT_LINK());
 	}
@@ -733,7 +731,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		 */
 		if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)
 			&& (index_ptr = zend_hash_find_ptr(&PGG(regular_list), str.s)) != NULL) {
-			php_pgsql_set_default_link(index_ptr);
+			php_pgsql_set_default_link(pgsql_link_from_obj(Z_OBJ_P(index_ptr)));
 			GC_ADDREF(Z_OBJ_P(index_ptr));
 			ZVAL_COPY(return_value, index_ptr);
 
@@ -771,7 +769,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 
 		/* add it to the hash */
 		ZVAL_COPY(&new_index_ptr, return_value);
-		zend_hash_update_mem(&PGG(regular_list), str.s, (void *) &new_index_ptr, sizeof(zval));
+		zend_hash_update(&PGG(regular_list), str.s, &new_index_ptr);
 
 		/* Keep track of link => hash mapping, so we can remove the hash entry from regular_list
 		 * when the connection is closed. This uses the address of the connection rather than the
@@ -788,7 +786,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	if (! PGG(ignore_notices) && Z_TYPE_P(return_value) == IS_OBJECT) {
 		PQsetNoticeProcessor(pgsql, _php_pgsql_notice_handler, (void*)(zend_uintptr_t)Z_OBJ_P(return_value)->handle);
 	}
-	php_pgsql_set_default_link(return_value);
+	php_pgsql_set_default_link(pgsql_link_from_obj(Z_OBJ_P(return_value)));
 
 cleanup:
 	smart_str_free(&str);
@@ -849,8 +847,8 @@ PHP_FUNCTION(pg_close)
 	if (!pgsql_link) {
 		link = FETCH_DEFAULT_LINK();
 		CHECK_DEFAULT_LINK(link);
-		pgsql_link_free(link);
 		PGG(default_link) = NULL;
+		pgsql_link_free(link);
 		RETURN_TRUE;
 	}
 
@@ -2371,12 +2369,13 @@ PHP_FUNCTION(pg_lo_create)
 	} else if ((Z_TYPE_P(pgsql_link) == IS_OBJECT && instanceof_function(Z_OBJCE_P(pgsql_link), pgsql_link_ce))) {
 		link = Z_PGSQL_LINK_P(pgsql_link);
 		CHECK_PGSQL_LINK(link);
-		pgsql = link->conn;
 	} else {
 		zend_argument_type_error(1, "must be of type PgSql when the connection is provided");
 		RETURN_THROWS();
 	}
 
+	pgsql = link->conn;
+
 	if (oid) {
 		switch (Z_TYPE_P(oid)) {
 		case IS_STRING:
@@ -3341,7 +3340,7 @@ PHP_FUNCTION(pg_escape_string)
 				RETURN_THROWS();
 			}
 			link = Z_PGSQL_LINK_P(pgsql_link);
-            CHECK_PGSQL_LINK(link);
+			CHECK_PGSQL_LINK(link);
 			break;
 	}
 

ext/pgsql/php_pgsql.h

@@ -186,7 +186,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pgsql)
 	zend_long auto_reset_persistent;
 	int ignore_notices,log_notices;
 	HashTable notices;  /* notice message for each connection */
-	zval *default_link; /* default link when connection is omitted */
+	pgsql_link_handle *default_link; /* default link when connection is omitted */
 	HashTable hashes; /* hashes for each connection */
 	HashTable regular_list; /* connection list */
 ZEND_END_MODULE_GLOBALS(pgsql)

ext/pgsql/tests/09notice.phpt

@@ -49,7 +49,8 @@ try {
 }
 ?>
 --EXPECTF--
-resource(%d) of type (pgsql result)
+object(PgSqlResult)#%d (0) {
+}
 string(0) ""
 array(0) {
 }

ext/pgsql/tests/10pg_convert_9.phpt

@@ -60,4 +60,4 @@ Array of values must be an associative array with string keys
 Array of values must be an associative array with string keys
 Values must be of type string|int|float|bool|null, array given
 Values must be of type string|int|float|bool|null, stdClass given
-Values must be of type string|int|float|bool|null, resource given
+Values must be of type string|int|float|bool|null, PgSql given

ext/pgsql/tests/12pg_insert_9.phpt

@@ -54,10 +54,11 @@ echo "Ok\n";
 --EXPECTF--
 INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'\\x424242');
 INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES ('1234','AAA','BBB');
-resource(%d) of type (pgsql result)
+object(PgSqlResult)#%d (0) {
+}
 Array of values must be an associative array with string keys
 Array of values must be an associative array with string keys
 Values must be of type string|int|float|bool|null, array given
 Values must be of type string|int|float|bool|null, stdClass given
-Values must be of type string|int|float|bool|null, resource given
+Values must be of type string|int|float|bool|null, PgSql given
 Ok

ext/pgsql/tests/13pg_select_9.phpt

@@ -81,5 +81,5 @@ Array of values must be an associative array with string keys
 Array of values must be an associative array with string keys
 Values must be of type string|int|float|bool|null, array given
 Values must be of type string|int|float|bool|null, stdClass given
-Values must be of type string|int|float|bool|null, resource given
+Values must be of type string|int|float|bool|null, PgSql given
 Ok

ext/pgsql/tests/80_bug32223.phpt

@@ -53,8 +53,10 @@ pg_close($dbh);
 
 ?>
 --EXPECTF--
-resource(%d) of type (pgsql result)
-resource(%d) of type (pgsql result)
+object(PgSqlResult)#%d (0) {
+}
+object(PgSqlResult)#%d (0) {
+}
 array(1) {
   [0]=>
   string(1) "f"

ext/pgsql/tests/connect_after_close.phpt

@@ -10,6 +10,7 @@ include('config.inc');
 $db1 = pg_connect($conn_str);
 unset($db1);
 var_dump(pg_close());
+exit;
 $db2 = pg_connect($conn_str);
 unset($db2);
 var_dump(pg_close());