Merged revisions 369147 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r369147 | may | 2012-06-20 12:36:27 -0500 (Wed, 20 Jun 2012) | 10 lines

  fix locking issue on empty callList
  (issue ASTERISK-19298)
  Reported by:
          Dmitry Melekhov
  Patches:
          ASTERISK-18322-2.patch
  ........

  Merged revisions 369146 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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

diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c
index 046b5fcf4c311aa5cfadfa350dc3d10484a4d6a5..70677ab0af9c8bd28a12c848e996a65ad528a108 100644 (file)
--- a/addons/ooh323c/src/ooCalls.c
+++ b/addons/ooh323c/src/ooCalls.c
@@ -265,14 +265,13 @@ int ooEndCall(OOH323CallData *call)
 
 int ooRemoveCallFromList (OOH323CallData *call)
 {
-   if(!call)
+   if(!call || !gH323ep.callList)
       return OO_OK;
 
    ast_mutex_lock(&callListLock);
 
    OOTRACEINFO3("Removing call %lx: %s\n", call, call->callToken);
 
-   if (!gH323ep.callList) return OO_OK;
    if(call == gH323ep.callList)
    {
       if(!call->next)

diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c
index 202595f5dd0a0a400795f0904f4a9af2450a5c62..fb9526915d24cffa9509547eb7326cc645ab0dee 100644 (file)
--- a/addons/ooh323c/src/ooq931.c
+++ b/addons/ooh323c/src/ooq931.c
@@ -2373,7 +2373,7 @@ int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts)
       else
          OO_CLRFLAG(call->flags, OO_M_TUNNELING);
 
-      if(opts->disableGk)
+      if(opts->disableGk || gH323ep.gkClient == NULL)
          OO_SETFLAG(call->flags, OO_M_DISABLEGK);
       else
          OO_CLRFLAG(call->flags, OO_M_DISABLEGK);