[sr-dev] git:4.0: core/parser: Free rr correctly in error cases

[Daniel-Constantin Mierla]

Backports to 4.0 are welcome -- I was considering to do another 4.0.x 
release soon, but I expect to happen after freezing 4.2. On the other 
hand, if anyone wants to work on backporting fixes to 4.0, is welcome to 
do it.

Also, for pushing only in one branch, perhaps is better to explicitely 
set it in push request:

git push origin _local_branch_:_remote_branch_

So, pushing local 4.1 to remote 4.1 is like:

git push origin 4.1:4.1

For master:

git push origin master:master

Cheers,
Daniel

On 02/09/14 17:56, Waite, Hugh wrote:
> Sorry - this was an unintentional push - I only meant to push the feature on the master branch.
> Oh well - another couple of bugfixes backported to 4.0
>
> Hugh
>
> -----Original Message-----
> From: sr-dev-bounces at lists.sip-router.org [mailto:sr-dev-bounces at lists.sip-router.org] On Behalf Of Hugh Waite
> Sent: 02 September 2014 16:48
> To: sr-dev at lists.sip-router.org
> Subject: [sr-dev] git:4.0: core/parser: Free rr correctly in error cases
>
> Module: sip-router
> Branch: 4.0
> Commit: 5980733615e8ea4d79b6b4c8e8c3cec00e871277
> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5980733615e8ea4d79b6b4c8e8c3cec00e871277
>
> Author: Hugh Waite <hugh.waite at acision.com>
> Committer: Hugh Waite <hugh.waite at acision.com>
> Date:   Tue Aug 12 19:56:45 2014 +0100
>
> core/parser: Free rr correctly in error cases
>
> - Fix potential memory leak if parameters are parsed into rr structure (cherry picked from commit b40d92962b680ac29dd38ffe3c8f1aa1e39d3a97)
>
> ---
>
>   parser/parse_rr.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/parser/parse_rr.c b/parser/parse_rr.c index d3a2938..e3df4f3 100644
> --- a/parser/parse_rr.c
> +++ b/parser/parse_rr.c
> @@ -138,7 +138,7 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head)
>   }
>
>    error:
> -if (r) pkg_free(r);
> +if (r) free_rr(r);
>   free_rr(head); /* Free any contacts created so far */
>   return -1;
>
>
>
> _______________________________________________
> sr-dev mailing list
> sr-dev at lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
> ________________________________
> This e-mail and any attachment is for authorised use by the intended recipient(s) only. It may contain proprietary material, confidential information and/or be subject to legal privilege. It should not be copied, disclosed to, retained or used by, any other party. If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender. Thank you for understanding.
>
> _______________________________________________
> sr-dev mailing list
> sr-dev at lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

-- 
Daniel-Constantin Mierla
http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
Next Kamailio Advanced Trainings 2014 - http://www.asipto.com
Sep 22-25, Berlin, Germany ::: Oct 15-17, San Francisco, USA