core: use same condition for extra_params in create_via_hf()

(cherry picked from commit 62e822c)
kamailio · Apr 13, 2021 · 9d8b937 · 9d8b937
1 parent 05f60d4
commit 9d8b937
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c
@@ -2979,12 +2979,14 @@ char* create_via_hf(unsigned int *len,
 		/* params so far + ';rport' + '\0' */
 		via = (char*)pkg_malloc(extra_params.len+RPORT_LEN);
 		if(via==0) {
-		        PKG_MEM_ERROR;
+			PKG_MEM_ERROR;
 			if (extra_params.s) pkg_free(extra_params.s);
 			return 0;
 		}
-		if(extra_params.len!=0) {
+		if(extra_params.s!=NULL && extra_params.len>0) {
 			memcpy(via, extra_params.s, extra_params.len);
+		}
+		if(extra_params.s!=NULL) {
 			pkg_free(extra_params.s);
 		}
 		memcpy(via + extra_params.len, RPORT, RPORT_LEN-1);
@@ -3005,8 +3007,10 @@ char* create_via_hf(unsigned int *len,
 				if (extra_params.s) pkg_free(extra_params.s);
 				return 0;
 			}
-			if(extra_params.len != 0) {
+			if(extra_params.s!=NULL && extra_params.len>0) {
 				memcpy(via, extra_params.s, extra_params.len);
+			}
+			if(extra_params.s!=NULL) {
 				pkg_free(extra_params.s);
 			}
 			memcpy(via + extra_params.len, sbuf, slen);
@@ -3025,12 +3029,14 @@ char* create_via_hf(unsigned int *len,
 		if(xparams.len>0) {
 			via = (char*)pkg_malloc(extra_params.len+xparams.len+2);
 			if(via==0) {
-			        PKG_MEM_ERROR;
+				PKG_MEM_ERROR;
 				if (extra_params.s) pkg_free(extra_params.s);
 				return 0;
 			}
-			if(extra_params.len != 0) {
+			if(extra_params.s!=NULL && extra_params.len>0) {
 				memcpy(via, extra_params.s, extra_params.len);
+			}
+			if(extra_params.s!=NULL) {
 				pkg_free(extra_params.s);
 			}
 			/* add ';' between via parameters */