[sr-dev] git:5.0:114acb1d: pua_dialoginfo: fixed condition in mod init checking avp names

[Daniel-Constantin Mierla]

Module: kamailio
Branch: 5.0
Commit: 114acb1d4c94846e1371e476237fc62e57f90bb0
URL: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62e57f90bb0

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-10-23T10:42:47+02:00

pua_dialoginfo: fixed condition in mod init checking avp names

(cherry picked from commit 666c9d1fcdde00dbdd2e87ff797e554af6d72b5c)

---

Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c

---

Diff:  https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62e57f90bb0.diff
Patch: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62e57f90bb0.patch

---

diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c
index c6251840e0..a544f1fd4c 100644
--- a/src/modules/pua_dialoginfo/pua_dialoginfo.c
+++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c
@@ -584,7 +584,7 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params)
 	struct sip_msg *request = _params->req;
 	struct dlginfo_cell *dlginfo;
 
-	if (request->REQ_METHOD != METHOD_INVITE)
+	if (request==NULL || request->REQ_METHOD != METHOD_INVITE)
 		return;
 
 	if(send_publish_flag > -1 && !(request->flags & (1<<send_publish_flag)))
@@ -682,8 +682,8 @@ static int mod_init(void)
 
 	if(use_pubruri_avps) {
 
-		if(!(pubruri_caller_avp && *pubruri_caller_avp)
-				&& (pubruri_callee_avp && *pubruri_callee_avp)) {
+		if((pubruri_caller_avp==NULL || *pubruri_caller_avp==0)
+				|| (pubruri_callee_avp==NULL || *pubruri_callee_avp==0)) {
 			LM_ERR("pubruri_caller_avp and pubruri_callee_avp must be set,"
 					" if use_pubruri_avps is enabled\n");
 			return -1;