Merge pull request #153 from sn4kebite/pv-vn-fix

pv: Fixed assigning $null to $vn(name) pvs
kamailio · May 8, 2015 · 39112fc · 39112fc
2 parents 04410ae + d29930e
commit 39112fc
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c
@@ -1968,8 +1968,13 @@ int pv_set_scriptvar(struct sip_msg* msg, pv_param_t *param,
 	}
 	if((val==NULL) || (val->flags&PV_VAL_NULL))
 	{
-		avp_val.n = 0;
-		set_var_value((script_var_t*)param->pvn.u.dname, &avp_val, 0);
+		if(((script_var_t*)param->pvn.u.dname)->v.flags&VAR_TYPE_NULL)
+		{
+			set_var_value((script_var_t*)param->pvn.u.dname, NULL, 0);
+		} else {
+			avp_val.n = 0;
+			set_var_value((script_var_t*)param->pvn.u.dname, &avp_val, 0);
+		}
 		return 0;
 	}
 	flags = 0;