Module: sip-router Branch: sr_3.0 Commit: 9354d82c043b0fef64ad671505071ce64fc501b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9354d82c...

Author: Andrei Pelinescu-Onciul andrei@iptel.org Committer: Andrei Pelinescu-Onciul andrei@iptel.org Date: Mon Dec 14 13:00:07 2009 +0100

core: fix parsing for avps with the same name as a pv class

When a pv lookup fails, sometimes the pvspec is partially filled which, if not clean might mess-up the avp flags in the lval union. E.g.: $avp="..." caused problems (avp was marked as RE name).

---

cfg.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cfg.y b/cfg.y index bfe45e4..234b2d0 100644 --- a/cfg.y +++ b/cfg.y @@ -2435,6 +2435,10 @@ avp_pvar: AVP_OR_PVAR { s_tmp.s=$1; s_tmp.len=strlen(s_tmp.s); if (pv_parse_spec2(&s_tmp, &lval_tmp->lv.pvs, 1)==0){ /* not a pvar, try avps */ + /* lval_tmp might be partially filled by the failed + pv_parse_spec2() (especially if the avp name is the + same as a pv class) => clean it again */ + memset(lval_tmp, 0, sizeof(*lval_tmp)); lval_tmp->lv.avps.type|= AVP_NAME_STR; lval_tmp->lv.avps.name.s.s = s_tmp.s+1; lval_tmp->lv.avps.name.s.len = s_tmp.len-1;