Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()

1 files changed, 20 insertions, 0 deletions

diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index 8d7762ad8d..49b75ee2bb 100644
--- a/ext/pdo_dblib/dblib_stmt.c
+++ b/ext/pdo_dblib/dblib_stmt.c
@@ -95,6 +95,22 @@ static char *pdo_dblib_get_field_name(int type)
 }
 /* }}} */
 
+static void pdo_dblib_err_dtor(pdo_dblib_err *err)
+{
+	if (err->dberrstr) {
+		efree(err->dberrstr);
+		err->dberrstr = NULL;
+	}
+	if (err->lastmsg) {
+		efree(err->lastmsg);
+		err->lastmsg = NULL;
+	}
+	if (err->oserrstr) {
+		efree(err->oserrstr);
+		err->oserrstr = NULL;
+	}
+}
+
 static int pdo_dblib_stmt_cursor_closer(pdo_stmt_t *stmt)
 {
 	pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
@@ -102,6 +118,8 @@ static int pdo_dblib_stmt_cursor_closer(pdo_stmt_t *stmt)
 
 	/* Cancel any pending results */
 	dbcancel(H->link);
+
+	pdo_dblib_err_dtor(&H->err);
 	
 	return 1;
 }
@@ -110,6 +128,8 @@ static int pdo_dblib_stmt_dtor(pdo_stmt_t *stmt)
 {
 	pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
 
+	pdo_dblib_err_dtor(&S->err);
+
 	efree(S);
 
 	return 1;