Remove length checks as bzero is setting length to zero for custom_ca…

…ll_id
pjsip · Aug 30, 2024 · 56bafb7 · 56bafb7
1 parent 5b838bd
commit 56bafb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c
@@ -966,8 +966,7 @@ PJ_DEF(pj_status_t) pjsua_call_make_call(pjsua_acc_id acc_id,
                   (int)dlg->call_id->id.slen, dlg->call_id->id.ptr  ));
         pj_bzero(&call->opt.custom_call_id,
                   sizeof(call->opt.custom_call_id));
-        call->opt.custom_call_id.slen=0;
-     }
+    }
 
     /* Increment the dialog's lock otherwise when invite session creation
      * fails the dialog will be destroyed prematurely.

diff --git a/pjsip/src/pjsua2/call.cpp b/pjsip/src/pjsua2/call.cpp
@@ -234,9 +234,7 @@ void CallSetting::fromPj(const pjsua_call_setting &prm)
     this->audioCount        = prm.aud_cnt;
     this->videoCount        = prm.vid_cnt;
     this->mediaDir.clear();
-
-    if( prm.custom_call_id.slen > 0 )
-    this->customCallId        = pj2Str(prm.custom_call_id);
+    this->customCallId      = pj2Str(prm.custom_call_id);
 
     /* Since we don't know the size of media_dir array, we populate
      * mediaDir vector up to the element with non-default value.