[sr-dev] git:3.3: modules_k/rls: Fixed segmentation fault in RLS when a resource-list is updated

[Peter Dunkley]

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

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Sun Sep 16 23:47:20 2012 +0100

modules_k/rls: Fixed segmentation fault in RLS when a resource-list is updated

- Found and fixed by Hugh Waite @ Crocodile RCS
(cherry picked from commit bde7e9465db9e7c9ecb485c57edabbd032f3b770)

---

 modules_k/rls/subscribe.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c
index 8422f78..eabb3db 100644
--- a/modules_k/rls/subscribe.c
+++ b/modules_k/rls/subscribe.c
@@ -1058,15 +1058,13 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode)
 		{
 			LM_DBG("Removing subscription for %.*s\n", tmp_str->len, tmp_str->s);
 			s.expires = 0;
-			send_resource_subs(tmp_str->s, (void*)(&s));
+			send_resource_subs(tmp_str->s, params);
 			pkg_free(tmp_str->s);
 			pkg_free(tmp_str);
 		}
 	}
-	else
-	{
+	if (rls_contact_list != NULL)
 		list_free(&rls_contact_list);
-	}
 
 	pkg_free(wuri.s);
 	pkg_free(did_str.s);