Release statement (#102)

Author: mlazdans

firebird_utils.cpp

@@ -86,6 +86,12 @@ extern "C" void fbu_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ
 							timeZoneBufferLength, timeZoneBuffer);
 }
 
+extern "C" void fbu_release_statement(void *statement_ptr)
+{
+	Firebird::IStatement* statement = (Firebird::IStatement *)statement_ptr;
+	if (statement) statement->release();
+}
+
 extern "C" int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr)
 {
 	Firebird::IMaster* master = (Firebird::IMaster*)master_ptr;

firebird_utils.h

@@ -46,6 +46,7 @@ int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int n
   zval *into_array, void *statement_ptr);
 int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query,
   void *statement_ptr);
+void fbu_release_statement(void *statement_ptr);
 
 #endif // FB_API_VER >= 30
 

ibase_query.c

@@ -1873,14 +1873,18 @@ static void _php_ibase_field_info(zval *return_value, ibase_query *ib_query, int
 	if(IBG(master_instance) && IBG(get_statement_interface)) {
 		void *statement = NULL;
 		if(((fb_get_statement_interface_t)IBG(get_statement_interface))(IB_STATUS, &statement, &ib_query->stmt)){
+			fbu_release_statement(statement);
 			_php_ibase_error();
 			RETURN_FALSE;
 		}
 
 		if(fbu_insert_field_info(IBG(master_instance), IB_STATUS, is_outvar, num, return_value, statement)){
+			fbu_release_statement(statement);
 			_php_ibase_error();
 			RETURN_FALSE;
 		}
+
+		fbu_release_statement(statement);
 	} else {
 #endif
 		// Old API
@@ -2174,12 +2178,16 @@ static int _php_ibase_alloc_ht_aliases(ibase_query *ib_query)
 	if(IBG(master_instance) && IBG(get_statement_interface)) {
 		void *statement = NULL;
 		if(((fb_get_statement_interface_t)IBG(get_statement_interface))(IB_STATUS, &statement, &ib_query->stmt)){
+			fbu_release_statement(statement);
 			return FAILURE;
 		}
 
 		if(fbu_insert_aliases(IBG(master_instance), IB_STATUS, ib_query, statement)){
+			fbu_release_statement(statement);
 			return FAILURE;
 		}
+
+		fbu_release_statement(statement);
 	} else {
 #endif
 		// Old API