[sr-dev] git:4.1:e57bae2f: avpops: remove unecessary test for deleting avps by name rules

Module: kamailio Branch: 4.1 Commit: e57bae2fa2a8a784e12c93a5d8a45e59290cd55e URL: https://github.com/kamailio/kamailio/commit/e57bae2fa2a8a784e12c93a5d8a45e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-14T15:28:10+02:00 avpops: remove unecessary test for deleting avps by name rules - causes crash, following the change to use cached pv structures - reported by Alexandr Dubovikov, GH #239 (cherry picked from commit b120b47c39034d4bc384ff733ce62b845f2b4062) (cherry picked from commit 9c6eef916be7926ae2c7f926da670a3e01226232) (cherry picked from commit c5d4c25bc54a823a60abbd1f22ad23c4ff7ffd61) --- Modified: modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/e57bae2fa2a8a784e12c93a5d8a45e5… Patch: https://github.com/kamailio/kamailio/commit/e57bae2fa2a8a784e12c93a5d8a45e5… --- diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index c3fc69a..2fb8ae9 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -798,10 +798,6 @@ int ops_delete_avp(struct sip_msg* msg, struct fis_param *ap) ((ap->opd&AVPOPS_VAL_INT)&&((avp->flags&AVP_NAME_STR))==0) || ((ap->opd&AVPOPS_VAL_STR)&&(avp->flags&AVP_NAME_STR)) ) ) continue; - if((ap->u.sval->pvp.pvn.u.isname.type&AVP_SCRIPT_MASK)!=0 - && ((ap->u.sval->pvp.pvn.u.isname.type&AVP_SCRIPT_MASK) - &avp->flags)==0) - continue; /* remove avp */ destroy_avp( avp ); n++;