1 files changed, 54 insertions, 45 deletions

diff --git a/src/opcodes.cpp b/src/opcodes.cpp
index 3527f83..e82ce33 100644
--- a/src/opcodes.cpp
+++ b/src/opcodes.cpp
@@ -95,11 +95,11 @@ public:
                 try {     
                     switch (queryData->queryType) {
                         case SCALARSTRING: {
-                            std::string resultString = connection->ScalarString(queryData->sql, queryData->row, queryData->col);
+                            std::string resultString = connection->ScalarString(queryData->sql, csound, queryData->row, queryData->col);
                             if (charData != NULL) {
                                 csound->free(charData);
                             }
-                            charData = csound->strdup(resultString.c_str());
+                            charData = csound->strdup((char*) resultString.c_str());
                             charSize = resultString.length() + 1;
                         }
                             break;
@@ -128,7 +128,7 @@ public:
                     status = 1;
                     done = true;
                     pending = false;
-                    error = csound->strdup(e.what());
+                    error = csound->strdup((char*) e.what());
                 }
                 UNLOCK(connection);
             }
@@ -440,12 +440,12 @@ struct dbexec : csnd::InPlug<2> {
         LOCK(connection);
         try {
             connection->Exec(sql.data);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->init_error(e.what());
         } 
         UNLOCK(connection);
-        
+       	return OK; 
     }
 };
 
@@ -461,14 +461,15 @@ struct dbscalar : csnd::Plugin<1, 4> {
             return csound->init_error(badHandle);
         }
         STRINGDAT &sql = inargs.str_data(1);
+		LOCK(connection);
         try {
-            LOCK(connection);
             outargs[0] = connection->Scalar(sql.data, inargs[2], inargs[3]);
-            UNLOCK(connection);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->init_error(e.what());
-        } 
+        }
+		UNLOCK(connection)
+		return OK;
     }
 };
 
@@ -479,6 +480,7 @@ struct dbscalarstr : csnd::Plugin<1, 4> {
     static constexpr char const *otypes = "S";
     static constexpr char const *itypes = "iSoo";
     ConnectionData* connection;
+    char* resultString;
     
     int init() {
         if (!(connection = getConnection(csound, inargs[0]))) {
@@ -486,16 +488,20 @@ struct dbscalarstr : csnd::Plugin<1, 4> {
         }
         STRINGDAT &sql = inargs.str_data(1);
         STRINGDAT &result = outargs.str_data(0);
+        LOCK(connection);
         try {
-            LOCK(connection);
-            std::string resultString = connection->ScalarString(sql.data, inargs[2], inargs[3]);
-            UNLOCK(connection);
-            result.size = resultString.length() + 1;
-            result.data = csound->strdup(resultString.c_str());
-            return OK;
+            if (resultString != NULL) {
+                csound->free(resultString);
+            }
+            resultString = connection->ScalarString(sql.data, csound, inargs[2], inargs[3]);
+            result.size = strlen(resultString) + 1;
+            result.data = resultString;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->init_error(e.what());
-        } 
+        }
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -516,15 +522,15 @@ struct dbarray : csnd::Plugin<1, 2> {
         STRINGDAT &sql = inargs.str_data(1);
 
         ARRAYDAT* array = (ARRAYDAT*) outargs(0);
-
+		LOCK(connection);
         try {
-            LOCK(connection);
             connection->ArrayQuery(sql.data, csound, array);
-            UNLOCK(connection);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->init_error(e.what());
         }
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -544,15 +550,15 @@ struct dbarraystr : csnd::Plugin<1, 2> {
         STRINGDAT &sql = inargs.str_data(1);
 
         ARRAYDAT* array = (ARRAYDAT*) outargs(0);
-
+		LOCK(connection);
         try {
-            LOCK(connection);
             connection->ArrayQueryString(sql.data, csound, array);
-            UNLOCK(connection);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->init_error(e.what());
         }
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -579,14 +585,15 @@ struct dbexec_kb : csnd::InPlug<2> {
     
     int kperf() {
         STRINGDAT &sql = args.str_data(1);
+		LOCK(connection);
         try {
-            LOCK(connection);
             connection->Exec(sql.data);
-            UNLOCK(connection);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->perf_error(e.what(), this);
         } 
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -606,14 +613,15 @@ struct dbscalar_kb : csnd::Plugin<1, 4> {
     
     int kperf() {
         STRINGDAT &sql = inargs.str_data(1);
+		LOCK(connection);
         try {
-            LOCK(connection);
             outargs[0] = connection->Scalar(sql.data, inargs[2], inargs[3]);
-            UNLOCK(connection);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->perf_error(e.what(), this);
         } 
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -636,16 +644,17 @@ struct dbscalarstr_kb : csnd::Plugin<1, 4> {
             
         STRINGDAT &sql = inargs.str_data(1);
         STRINGDAT &result = outargs.str_data(0);
+		LOCK(connection);
         try {
-            LOCK(connection);
-            std::string resultString = connection->ScalarString(sql.data, inargs[2], inargs[3]);
-            UNLOCK(connection);
-            result.size = resultString.length() + 1;
-            result.data = csound->strdup(resultString.c_str());
-            return OK;
+            char* resultString = connection->ScalarString(sql.data, csound, inargs[2], inargs[3]);
+            result.size = strlen(resultString) + 1;
+            result.data = resultString;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->perf_error(e.what(), this);
         } 
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -670,15 +679,15 @@ struct dbarray_kb : csnd::Plugin<1, 2> {
         STRINGDAT &sql = inargs.str_data(1);
 
         ARRAYDAT* array = (ARRAYDAT*) outargs(0);
-
+		LOCK(connection);
         try {
-            LOCK(connection);
             connection->ArrayQuery(sql.data, csound, array);
-            UNLOCK(connection);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->perf_error(e.what(), this);
         }
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -702,15 +711,15 @@ struct dbarraystr_kb : csnd::Plugin<1, 2> {
         STRINGDAT &sql = inargs.str_data(1);
 
         ARRAYDAT* array = (ARRAYDAT*) outargs(0);
-
+		LOCK(connection);
         try {
-            LOCK(connection);
             connection->ArrayQueryString(sql.data, csound, array);
-            UNLOCK(connection);
-            return OK;
         } catch (const std::exception &e) {
+			UNLOCK(connection);
             return csound->perf_error(e.what(), this);
         }
+		UNLOCK(connection);
+		return OK;
     }
 };
 
@@ -746,4 +755,4 @@ void csnd::on_load(csnd::Csound *csound) {
     csnd::plugin<dbarray_kb>(csound, "dbarray_kb", csnd::thread::ik);
     csnd::plugin<dbarraystr_kb>(csound, "dbarray_kb.S", csnd::thread::ik);
 
-}
\ No newline at end of file
+}