Merge branch 'master' into coverity_scan

OpenSIPS · Jul 9, 2020 · 6c022e4 · 6c022e4
2 parents 0337996 + 7a63840
commit 6c022e4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/lib/reg/pn.c b/lib/reg/pn.c
@@ -339,14 +339,14 @@ enum pn_action pn_inspect_ct_params(struct sip_msg *req, const str *ct_uri)
 next_param:;
 	}
 
+	if (is_handled_upstream)
+		return PN_MATCH_PN_PARAMS;
+
 	if (is_cap_query) {
 		pvd->append_fcaps_query = 1;
 		return PN_LIST_ONE_PNS;
 	}
 
-	if (is_handled_upstream)
-		return PN_MATCH_PN_PARAMS;
-
 	pvd->append_fcaps = 1;
 	return PN_ON;
 }
@@ -854,7 +854,7 @@ int pn_add_reply_purr(const ucontact_t *ct)
 	struct sip_uri puri;
 	struct pn_provider *prov;
 
-	if (!pn_enable_purr)
+	if (!pn_enable_purr || !ct)
 		return 0;
 
 	if (parse_uri(ct->c.s, ct->c.len, &puri) != 0) {
@@ -870,7 +870,8 @@ int pn_add_reply_purr(const ucontact_t *ct)
 		if (str_match(&prov->name, &puri.pn_provider_val))
 			goto have_provider;
 
-	LM_DBG("skipping unknown provider '%.*s'\n", prov->name.len, prov->name.s);
+	LM_DBG("skipping unknown provider '%.*s'\n",
+	       puri.pn_provider_val.len, puri.pn_provider_val.s);
 	return 0;
 
 have_provider:

diff --git a/mem/hp_malloc_dyn.h b/mem/hp_malloc_dyn.h
@@ -1567,7 +1567,8 @@ void hp_status(struct hp_block *hpb)
 
 			if (h > HP_LINEAR_HASH_SIZE) {
 				LM_GEN1(memdump, "[ %4d ][ %8d B -> %7d B ][ frags: %5d ]\n",
-						h, (int)UN_HASH(h), (int)UN_HASH(h+1) - (int)ROUNDTO, i);
+						h, (int)UN_HASH(h),
+				           (int)UN_HASH(h == (HP_HASH_SIZE - 1) ? h : h+1) - (int)ROUNDTO, i);
 			} else
 				LM_GEN1(memdump, "[ %4d ][ %5d B ][ frags: %5d ]\n",
 						h, h * (int)ROUNDTO, i);

diff --git a/modules/mid_registrar/save.c b/modules/mid_registrar/save.c
@@ -552,7 +552,7 @@ int dup_req_info(struct sip_msg *req, struct mid_reg_info *mri)
 
 	mri->cflags = getb0flags(req);
 
-	if (req && parse_allow(req) != -1)
+	if (parse_allow(req) != -1)
 		allowed = get_allow_methods(req);
 	else
 		allowed = ALL_METHODS;

diff --git a/modules/qrouting/qr_stats.c b/modules/qrouting/qr_stats.c
@@ -450,9 +450,7 @@ void qr_rld_prepare_part(void *param)
 	if (pl->qr_rules_start)
 		shm_free(pl->qr_rules_start);
 
-	if (pl)
-		shm_free(pl);
-
+	shm_free(pl);
 	qr_rld_list = NULL;
 }
 

diff --git a/sr_module_deps.c b/sr_module_deps.c
@@ -84,6 +84,7 @@ module_dependency_t *_alloc_module_dep(enum module_type mod_type, char *mod_name
 		md = pkg_realloc(md, (ndeps + 1) * sizeof *md);
 		if (!md) {
 			LM_ERR("oom\n");
+			va_end(ap);
 			return NULL;
 		}
 		memset(&md[ndeps], 0, sizeof *md);

diff --git a/statistics.h b/statistics.h
@@ -209,7 +209,7 @@ extern gen_lock_t *stat_lock;
 		#define update_stat( _var, _n) \
 			do { \
 				if ( !((_var)->flags&STAT_IS_FUNC) ) {\
-					if (_n>=0) \
+					if ((long)(_n) >= 0L) \
 						atomic_add( _n, (_var)->u.val);\
 					else \
 						atomic_sub( -(_n), (_var)->u.val);\