[sr-dev] git:master:321a6140: textops: fix leak when subst_hf() with flag f is used
Daniel-Constantin Mierla
miconda at gmail.com
Sun Oct 11 03:39:35 CEST 2015
Module: kamailio
Branch: master
Commit: 321a6140cdc7d6fd3f18f911af9825bb62575ace
URL: https://github.com/kamailio/kamailio/commit/321a6140cdc7d6fd3f18f911af9825bb62575ace
Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2015-10-11T03:38:24+02:00
textops: fix leak when subst_hf() with flag f is used
- substituion list was not freed
---
Modified: modules/textops/textops.c
---
Diff: https://github.com/kamailio/kamailio/commit/321a6140cdc7d6fd3f18f911af9825bb62575ace.diff
Patch: https://github.com/kamailio/kamailio/commit/321a6140cdc7d6fd3f18f911af9825bb62575ace.patch
---
diff --git a/modules/textops/textops.c b/modules/textops/textops.c
index 9aaada6..198332b 100644
--- a/modules/textops/textops.c
+++ b/modules/textops/textops.c
@@ -2844,6 +2844,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag
begin=body.s;
off=begin-msg->buf;
+ if (lst) replace_lst_free(lst);
lst=subst_run(se, begin, msg, &nmatches);
body.s[body.len] = c;
if(lst==0 && flags!=NULL && *flags=='f')
@@ -2880,7 +2881,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag
}
/* if flags set for first header, then all done */
if(flags!=NULL && *flags=='f')
- return ret;
+ goto done;
}
if(hfl!=NULL)
{
@@ -2892,6 +2893,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag
begin=body.s;
off=begin-msg->buf;
+ if (lst) replace_lst_free(lst);
lst=subst_run(se, begin, msg, &nmatches);
body.s[body.len] = c;
if(lst==0)
@@ -2924,10 +2926,11 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag
}
}
error:
- LM_DBG("lst was %p\n", lst);
- if (lst) replace_lst_free(lst);
if (nmatches<0)
LM_ERR("%s subst_run failed\n", exports.name);
+ LM_DBG("lst was %p\n", lst);
+done:
+ if (lst) replace_lst_free(lst);
return ret;
}
More information about the sr-dev
mailing list