Merge "chan_ooh323: Fix cppcheck warnings"

addons/chan_ooh323.c

@@ -5053,9 +5053,7 @@ struct ast_frame *ooh323_rtp_read(struct ast_channel *ast, struct ooh323_pvt *p)
 					ast_log(LOG_NOTICE, "Failed to async goto '%s' into fax of '%s'\n", ast_channel_name(p->owner),target_context);
 				}
 				p->faxdetected = 1;
-				if (dfr) {
-					ast_frfree(dfr);
-				}
+				ast_frfree(dfr);
 				return &ast_null_frame;
 			}
 		}

addons/ooh323c/src/context.c

@@ -164,6 +164,7 @@ OOCTXT* newContext ()
          /* ASN1CRTFREE0 (pctxt); */
 	 ast_free(pctxt);
          pctxt = 0;
+         return (pctxt);
       }
       pctxt->flags |= ASN1DYNCTXT;
    }

addons/ooh323c/src/memheap.c

@@ -623,7 +623,7 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p)
             }
          }
       }
-      if (!ISLAST (pElem) && ISFREE (GETNEXT (pElem))) {
+      if (pElem && !ISLAST (pElem) && ISFREE (GETNEXT (pElem))) {
          OSMemElemDescr* nextelem_p = GETNEXT (pElem);
 
          /* +1 because the OSMemElemDescr has size ONE unit (8 bytes) */
@@ -638,7 +638,7 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p)
       }
 
       /* correct the prevOff field of next element */
-      if (!ISLAST (pElem)) {
+      if (pElem && !ISLAST (pElem)) {
          OSMemElemDescr* nextelem_p = GETNEXT (pElem);
          pElem_prevOff (nextelem_p) = QOFFSETOF (nextelem_p, pElem);
       }
@@ -686,7 +686,7 @@ static void initNewFreeElement (OSMemBlk* pMemBlk,
    }
 
    pNextElem = GETNEXT (pNewElem);
-   if (ISFREE (pNextElem)) {
+   if (pNextElem && ISFREE (pNextElem)) {
 
       /* if the next elem is free, then unite them together */
 
@@ -820,7 +820,7 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_)
             /* look for free element after pElem */
 
             pNextElem = GETNEXT (pElem);
-            if (ISFREE (pNextElem)) {
+            if (pNextElem && ISFREE (pNextElem)) {
                /* +1 'cos sizeof (OSMemElemDescr) == 1 unit */
                sumSize += pElem_nunits (pNextElem) + 1;
                freeMem++;
@@ -1062,7 +1062,7 @@ void memHeapAddRef (void** ppvMemHeap)
 void memHeapRelease (void** ppvMemHeap)
 {
    OSMemHeap** ppMemHeap = (OSMemHeap**)ppvMemHeap;
-   OSMemHeap* pMemHeap = *ppMemHeap;
+   OSMemHeap* pMemHeap;
 
    if (ppMemHeap != 0 && *ppMemHeap != 0 && --(*ppMemHeap)->refCnt == 0) {
       OSMemLink* pMemLink, *pMemLink2;
@@ -1080,6 +1080,7 @@ void memHeapRelease (void** ppvMemHeap)
       }
 
       if ((*ppMemHeap)->flags & RT_MH_FREEHEAPDESC) {
+         pMemHeap = *ppMemHeap;
          ast_mutex_destroy(&pMemHeap->pLock);
          ast_free(*ppMemHeap);
       }

addons/ooh323c/src/ooCalls.c

@@ -805,8 +805,7 @@ int ooAddMediaInfo(OOH323CallData *call, OOMediaInfo mediaInfo)
 
    if(!call)
    {
-      OOTRACEERR3("Error:Invalid 'call' param for ooAddMediaInfo.(%s, %s)\n",
-                   call->callType, call->callToken);
+      OOTRACEERR1("Error:Invalid 'call' param for ooAddMediaInfo.\n");
       return OO_FAILED;
    }
    newMediaInfo = (OOMediaInfo*) memAlloc(call->pctxt, sizeof(OOMediaInfo));

addons/ooh323c/src/ooCapability.c

@@ -62,8 +62,6 @@ int ooCapabilityEnableDTMFCISCO
       /*Dynamic RTP payload type range is from 96 - 127 */
       if(dynamicRTPPayloadType >= 96 && dynamicRTPPayloadType <= 127)
         gcDynamicRTPPayloadType = dynamicRTPPayloadType;
-      else
-        call->dtmfcodec = dynamicRTPPayloadType;
    }
    else{
       call->dtmfmode |= OO_CAP_DTMF_CISCO;
@@ -623,8 +621,7 @@ int ooCapabilityAddT38Capability
    else pctxt = call->pctxt;
 
    epCap = (ooH323EpCapability*)memAllocZ(pctxt, sizeof(ooH323EpCapability));
-   params = (OOCapParams*) memAlloc(pctxt, sizeof(OOCapParams));
-   memset(params, 0 , sizeof(OOCapParams));
+   params = (OOCapParams*) memAllocZ(pctxt, sizeof(OOCapParams));
    if(!epCap || !params)
    {
       OOTRACEERR1("ERROR: Memory - ooCapabilityAddT38Capability - "
@@ -808,8 +805,7 @@ void* ooCapabilityCreateDTMFCapability(int cap, int dtmfcodec, OOCTXT *pctxt)
       }
       memset(pATECap, 0, sizeof(H245AudioTelephonyEventCapability));
       pATECap->dynamicRTPPayloadType = dtmfcodec;
-      events = (char*)memAlloc(pctxt, strlen("0-16")+1);
-      memset(events, 0, strlen("0-16")+1);
+      events = (char*)memAllocZ(pctxt, strlen("0-16")+1);
       if(!events)
       {
          OOTRACEERR1("Error:Memory - ooCapabilityCreateDTMFCapability - events\n");

addons/ooh323c/src/ooGkClient.c

@@ -2332,9 +2332,8 @@ int ooGkClientSendIRR
    pIRR->m.perCallInfoPresent = TRUE;
 
    perCallInfo =
-    (H225InfoRequestResponse_perCallInfo_element *)memAlloc(pctxt,
+    (H225InfoRequestResponse_perCallInfo_element *)memAllocZ(pctxt,
      sizeof(H225InfoRequestResponse_perCallInfo_element));
-   memset(perCallInfo, 0, sizeof(H225InfoRequestResponse_perCallInfo_element));
 
    if(!perCallInfo)
    {

addons/ooh323c/src/ooh245.c

@@ -356,7 +356,6 @@ int ooSendTermCapMsg(OOH323CallData *call)
    /* pctxt = &gH323ep.msgctxt; */
    pctxt = call->msgctxt;
    ph245msg->msgType = OOTerminalCapabilitySet;
-   memset(request, 0, sizeof(H245RequestMessage));
    if(request == NULL)
    {
       OOTRACEERR3("ERROR: No memory allocated for request message (%s, %s)\n",
@@ -364,6 +363,7 @@ int ooSendTermCapMsg(OOH323CallData *call)
       return OO_FAILED;
    }
 
+   memset(request, 0, sizeof(H245RequestMessage));
    request->t = T_H245RequestMessage_terminalCapabilitySet;
    request->u.terminalCapabilitySet = (H245TerminalCapabilitySet*)
                   memAlloc(pctxt, sizeof(H245TerminalCapabilitySet));

addons/ooh323c/src/ooq931.c

@@ -2439,8 +2439,10 @@ int ooH323HandleCallFwdRequest(OOH323CallData *call)
       alias = call->pCallFwdData->aliases;
       while(alias)
       {
-         pNewAlias = (ooAliases*) memAlloc(pctxt, sizeof(ooAliases));
-         pNewAlias->value = (char*) memAlloc(pctxt, strlen(alias->value)+1);
+         pNewAlias = (ooAliases*) memAllocZ(pctxt, sizeof(ooAliases));
+         if (pNewAlias) {
+            pNewAlias->value = (char*) memAllocZ(pctxt, strlen(alias->value)+1);
+         }
          if(!pNewAlias || !pNewAlias->value)
          {
             OOTRACEERR3("Error:Memory - ooH323HandleCallFwdRequest - "