ODBC-481 Crash in SQLDisconnect after SQLCancel if it only closed cursor

One of locks stayed locked and it is not re-entrant.
Added testcase in separate suite as first I expected other conditions
would be needed to be met in order to re-create the issue - I thought it
would need "clean" and only env. But let it stay separate as that suite
may get another use.

Author: lawrinn

driver/ma_api_internal.cpp

@@ -317,6 +317,7 @@ SQLRETURN MA_SQLCancel(SQLHSTMT StatementHandle)
       {
         ret= MADB_FromException(Stmt->Error, e);
       }
+      lock.unlock();
     }
     else
     {
@@ -354,6 +355,7 @@ SQLRETURN MA_SQLCancel(SQLHSTMT StatementHandle)
       {
         ret= MADB_FromException(Stmt->Error, e);
       }
+      lock.unlock();
     }
     else
     {

driver/ma_connection.cpp

@@ -172,8 +172,7 @@ SQLRETURN MADB_SQLDisconnect(SQLHDBC ConnectionHandle)
   }
   else
   {
-    MADB_SetError(&Connection->Error, MADB_ERR_08003, nullptr, 0);
-    ret= Connection->Error.ReturnValue;
+    ret= MADB_SetError(&Connection->Error, MADB_ERR_08003, nullptr, 0);
   }
   Connection->ConnOrSrcCharset= nullptr;
 

test/CMakeLists.txt

@@ -60,7 +60,7 @@ SET (ODBC_TESTS
      "basic" "types" "blob" "desc" "info" "tran" "catalog1" "catalog2"
      "use_result" "scroll" "bulk" "prepare" "datetime" "keys"
      "curext" "relative" "unicode" "cursor" "dyn_cursor"
-     "error" "param" "result1" "result2" "multistatement" "mariadb_specific")
+     "error" "param" "result1" "result2" "multistatement" "mariadb_specific" "standalone")
 SET(COMMON_TEST_SOURCES tap.h)
 # Interactive makes sense on WIN32 only atm
 IF (BUILD_INTERACTIVE_TESTS)

test/standalone.c

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+// Copyright (c) 2025 MariaDB Corporation plc
+
+// Tests without any automatic ODBC actions from the framework
+#include "tap.h"
+
+ODBC_TEST(odbc481)
+{
+  AllocEnvConn(&Env, &Connection);
+  Stmt= DoConnect(Connection, FALSE, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL);
+  FAIL_IF(Stmt == NULL, "Failed to connect or allocate statement");
+  OK_SIMPLE_STMT(Stmt, "SET SESSION lc_messages='en_US'");
+  EXPECT_STMT(Stmt, SQLMoreResults(Stmt), SQL_NO_DATA_FOUND);
+  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+  CHECK_STMT_RC(Stmt, SQLCancel(Stmt));
+  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_DROP));
+  CHECK_DBC_RC(Connection, SQLDisconnect(Connection));
+  return OK;
+}
+
+MA_ODBC_TESTS my_tests[]=
+{
+  {odbc481, "odbc481-onecallcancel", NORMAL},
+  {NULL, NULL, 0}
+};
+
+
+int main(int argc, char **argv)
+{
+  int ret, tests= sizeof(my_tests)/sizeof(MA_ODBC_TESTS) - 1;
+
+  get_options(argc, argv);
+
+  plan(tests);
+
+  ret= run_tests_bare(my_tests);
+
+  return ret;
+}

test/tap.h

@@ -207,7 +207,7 @@ static unsigned long defaultOptions= 67108866;
 static unsigned long my_options= 67108866;
 #define CHANGE_DEFAULT_OPTIONS(_NEW_OPTIONS) my_options=defaultOptions=_NEW_OPTIONS
 
-static SQLHANDLE     Env, Connection, Stmt, wConnection, wStmt;
+static SQLHANDLE     Env= NULL, Connection= NULL, Stmt= NULL, wConnection= NULL, wStmt= NULL;
 static SQLINTEGER    OdbcVer= SQL_OV_ODBC3;
 static unsigned int  DmMajor= 0, DmMinor= 0, DmPatch= 0;
 static unsigned int  my_port= 3306;
@@ -1189,6 +1189,87 @@ int ReadInfoOneTime(HDBC Connection, HSTMT Stmt)
   return OK;
 }
 
+
+int run_tests_bare(MA_ODBC_TESTS* tests)
+{
+  int         rc, i= 1, failed= 0;
+  const char* comment;
+  SQLWCHAR* buff_before_test;
+
+  utf16= (little_endian() ? &utf16le : &utf16be);
+  utf32= (little_endian() ? &utf32le : &utf32be);
+
+  if (sizeof(SQLWCHAR) == 4)
+  {
+    DmUnicode= utf32;
+  }
+  else
+  {
+    DmUnicode= utf16;
+  }
+
+  if (utf8 == NULL || utf16 == NULL || utf32 == NULL)
+  {
+    fprintf(stdout, "HALT! Could not load charset info %p %p %p\n", utf8, utf16, utf32);
+    return 1;
+  }
+
+  wdsn= str2sqlwchar_on_gbuff((const char*)my_dsn, strlen((const char*)my_dsn) + 1, utf8, DmUnicode);
+  wuid= str2sqlwchar_on_gbuff((const char*)my_uid, strlen((const char*)my_uid) + 1, utf8, DmUnicode);
+  wpwd= str2sqlwchar_on_gbuff((const char*)my_pwd, strlen((const char*)my_pwd) + 1, utf8, DmUnicode);
+  wschema= str2sqlwchar_on_gbuff((const char*)my_schema, strlen((const char*)my_schema) + 1, utf8, DmUnicode);
+  wservername= str2sqlwchar_on_gbuff((const char*)my_servername, strlen((const char*)my_servername) + 1, utf8, DmUnicode);
+  wdrivername= str2sqlwchar_on_gbuff((const char*)my_drivername, strlen((const char*)my_drivername) + 1, utf8, DmUnicode);
+  wstrport= str2sqlwchar_on_gbuff((const char*)ma_strport, strlen((const char*)ma_strport) + 1, utf8, DmUnicode);
+  wadd_connstr= str2sqlwchar_on_gbuff((const char*)add_connstr, strlen((const char*)add_connstr) + 1, utf8, DmUnicode);
+
+  fprintf(stdout, "1..%d\n", tests_planned);
+  while (tests->title)
+  {
+    buff_before_test= buff_pos;
+
+    if (tests->skip_condition != NULL && tests->skip_condition())
+    {
+      rc= SKIP;
+    }
+    else
+    {
+      rc= tests->my_test();
+    }
+    comment = "";
+    if (rc != SKIP && tests->test_type != NORMAL)
+    {
+      comment= comments[tests->test_type][rc];
+      rc= OK;
+    }
+    else if (rc == FAIL)
+    {
+      failed++;
+    }
+
+    fprintf(stdout, "%s %d - %s%s\n", test_status[rc], i++, tests->title, comment);
+    tests++;
+
+    /* Relieving tests from restoring my_options and/or add_connstr. Also, a test may fail */
+    my_options= defaultOptions;
+    add_connstr= storedAddConnstr;
+    /* reset Statement */
+    fflush(stdout);
+  }
+
+  if (wConnection)
+  {
+    SQLDisconnect(wConnection);
+    SQLFreeHandle(SQL_HANDLE_DBC, wConnection);
+  }
+  ODBC_Disconnect(Env, Connection, Stmt);
+
+  if (failed)
+    return 1;
+  return 0;
+}
+
+
 int run_tests_ex(MA_ODBC_TESTS *tests, BOOL ProvideWConnection)
 {
   int         rc, i=1, failed=0;