Misc code fixes (bug #2762)

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f2be86336572473f5ede3d42210d551a863d396b..78233ab847ed1fe59a71f8cfcd7d06962193fc13 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -1796,6 +1796,11 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
 static void destroy_zt_pvt(struct zt_pvt **pvt)
 {
        struct zt_pvt *p = *pvt;
+       /* Remove channel from the list */
+       if(p->prev)
+               p->prev->next = p->next;
+       if(p->next)
+               p->next->prev = p->prev;
        ast_mutex_destroy(&p->lock);
        free(p);
        *pvt = NULL;
@@ -5529,7 +5534,7 @@ static int handle_init_r2_event(struct zt_pvt *i, mfcr2_event_t *e)
                           Steve's code */
                        /* Check for callerid, digits, etc */
                        i->hasr2call = 1;
-                       chan = zt_new(i, AST_STATE_RING, 0, SUB_REAL, 0);
+                       chan = zt_new(i, AST_STATE_RING, 0, SUB_REAL, 0, 0);
                        if (!chan) {
                                ast_log(LOG_WARNING, "Unable to create channel for channel %d\n", i->channel);
                                mfcr2_DropCall(i->r2, NULL, UC_NETWORK_CONGESTION);

diff --git a/pbx/pbx_wilcalu.c b/pbx/pbx_wilcalu.c
index b2f61454fa328020449783d80ad4b1fdd25621d4..632c79fa824cd7cf581b88db94e5296db1584253 100755 (executable)
--- a/pbx/pbx_wilcalu.c
+++ b/pbx/pbx_wilcalu.c
@@ -82,10 +82,10 @@ static void *autodial(void *ignore)
                fds[0].events = POLLIN;
                poll(fds, 1, -1);
                bytes=read(fd,buf,256);
-               buf[(int)bytes]=0;
 
                if(bytes>0){
                        int x;
+                       buf[(int)bytes]=0;
                        ast_log(LOG_DEBUG, "WilCalu : Read Buf %s\n",buf);
                        sendbufptr=sendbuf;
                        for(x=0; lastbuf[x]!=0 && x<257; x++);

diff --git a/res/res_odbc.c b/res/res_odbc.c
index dde43353faabeda7a06818ec7c23b8e6ab02da80..520581a6dc5a2521065ea47c2fce6c14e08acfbd 100755 (executable)
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -351,6 +351,7 @@ odbc_status odbc_obj_connect(odbc_obj * obj)
        if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
                SQLGetDiagRec(SQL_HANDLE_DBC, obj->con, 1, stat, &err, msg, 100, &mlen);
                SQLFreeHandle(SQL_HANDLE_ENV, obj->env);
+               ast_mutex_unlock(&obj->lock);
                ast_log(LOG_WARNING, "res_odbc: Error SQLConnect=%d errno=%ld %s\n", res, err, msg);
                return ODBC_FAIL;
        } else {