Transactional handles should be used for the insertbuf, if available.

Also, fix a possible resource leak.

(closes issue #18943)
 Reported by: irroot

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@310414 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 7d34ec232e08f641224f673d11d21122d9d7c92b..0a10dee4d538ce5890c2a8b41ce7b55a97650478 100644 (file)
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -302,12 +302,12 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
         * transaction, or else we CANNOT enforce atomicity.
         */
        for (dsn = 0; dsn < 5; dsn++) {
-               if (transactional) {
-                       /* This can only happen second time through or greater. */
-                       ast_log(LOG_WARNING, "Transactions do not work well with multiple DSNs for 'writehandle'\n");
-               }
-
                if (!ast_strlen_zero(query->writehandle[dsn])) {
+                       if (transactional) {
+                               /* This can only happen second time through or greater. */
+                               ast_log(LOG_WARNING, "Transactions do not work well with multiple DSNs for 'writehandle'\n");
+                       }
+
                        if ((obj = ast_odbc_retrieve_transaction_obj(chan, query->writehandle[dsn]))) {
                                transactional = 1;
                        } else {
@@ -332,9 +332,27 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
        if (stmt && rows == 0 && ast_str_strlen(insertbuf) != 0) {
                SQLCloseCursor(stmt);
                SQLFreeHandle(SQL_HANDLE_STMT, stmt);
-               for (dsn = 0; dsn < 5; dsn++) {
+               if (obj && !transactional) {
+                       ast_odbc_release_obj(obj);
+                       obj = NULL;
+               }
+
+               for (transactional = 0, dsn = 0; dsn < 5; dsn++) {
                        if (!ast_strlen_zero(query->writehandle[dsn])) {
-                               obj = ast_odbc_request_obj(query->writehandle[dsn], 0);
+                               if (transactional) {
+                                       /* This can only happen second time through or greater. */
+                                       ast_log(LOG_WARNING, "Transactions do not work well with multiple DSNs for 'writehandle'\n");
+                               } else if (obj) {
+                                       ast_odbc_release_obj(obj);
+                                       obj = NULL;
+                               }
+
+                               if ((obj = ast_odbc_retrieve_transaction_obj(chan, query->writehandle[dsn]))) {
+                                       transactional = 1;
+                               } else {
+                                       obj = ast_odbc_request_obj(query->writehandle[dsn], 0);
+                                       transactional = 0;
+                               }
                                if (obj) {
                                        stmt = ast_odbc_direct_execute(obj, generic_execute, ast_str_buffer(insertbuf));
                                }
@@ -344,10 +362,6 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
                                SQLRowCount(stmt, &rows);
                                break;
                        }
-                       if (obj) {
-                               ast_odbc_release_obj(obj);
-                               obj = NULL;
-                       }
                }
        } else if (stmt) {
                status = "SUCCESS";
@@ -372,10 +386,12 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
                obj = NULL;
        }
 
-       if (chan)
+       if (chan) {
                ast_autoservice_stop(chan);
-       if (bogus_chan)
+       }
+       if (bogus_chan) {
                ast_channel_free(chan);
+       }
 
        return 0;
 }