[sr-dev] git:master: sdpops: use PV cache to lookup the parameter

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: 8c7e90f87e90e07fa93da04994013383bdf79e49
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c7e90f87e90e07fa93da04994013383bdf79e49

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Fri Jun  8 22:47:21 2012 +0200

sdpops: use PV cache to lookup the parameter

- parsing PV names at runtime is a memory leak risk as PVs support
  dynamic names and allocate memory for them (applies for AVPs as well)
- don't add an avps with a string value pointing to NULL in case SDP is
  missing - potential risk of seg fault in very strict OSes as later
  there is a memcpy() to clone the value. Return -2 if there is no SDP

---

 modules/sdpops/sdpops_mod.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c
index 402ca30..df7d6e6 100644
--- a/modules/sdpops/sdpops_mod.c
+++ b/modules/sdpops/sdpops_mod.c
@@ -942,17 +942,22 @@ static int w_get_sdp(sip_msg_t* msg, char *avp)
 	int_str avp_name;
 	static unsigned short avp_type = 0;
 	str s;
-	pv_spec_t avp_spec;
+	pv_spec_t *avp_spec = NULL;
 	int sdp_missing=1;
 	
 	s.s = avp; s.len = strlen(s.s);
-	if (pv_parse_spec(&s, &avp_spec)==0
-			|| avp_spec.type!=PVT_AVP) {
+	if (pv_locate_name(&s) != s.len)
+	{
+		LM_ERR("invalid parameter\n");
+		return -1;
+	}
+	if (((avp_spec = pv_cache_get(&s)) == NULL)
+			|| avp_spec->type!=PVT_AVP) {
 		LM_ERR("malformed or non AVP %s AVP definition\n", avp);
 		return -1;
 	}
 
-	if(pv_get_avp_name(0, &avp_spec.pvp, &avp_name, &avp_type)!=0)
+	if(pv_get_avp_name(0, &avp_spec->pvp, &avp_name, &avp_type)!=0)
 	{
 		LM_ERR("[%s]- invalid AVP definition\n", avp);
 		return -1;
@@ -966,9 +971,8 @@ static int w_get_sdp(sip_msg_t* msg, char *avp)
 	sdp = (sdp_info_t*)msg->body;
 	
 	if (sdp_missing) {
-		avp_val.s.s = NULL;
-		avp_val.s.len = 0;
 		LM_DBG("No SDP\n");
+		return -2;
 	} else {
 		avp_val.s.s = pkg_malloc(sdp->raw_sdp.len);
 		avp_val.s.len = sdp->raw_sdp.len;