From 76c7fc26ebf759d419bc7026898e0233f68e2acd Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Sun, 26 Feb 2012 01:19:47 -0300 Subject: [PATCH] SF Bug Tracker id 3489999 - UpnpString leaks in genaSubscribe() Submitted: Yoichi NAKAYAMA ( yoichi ) - 2012-02-21 07:06:35 PST In genaSubscribe() (defined in upnp/src/gena/gena_ctrlpt.c), ActualSID and EventURL will not be freed if ScheduleGenaAutoRenew returns UPNP_E_SUCCESS. This fixes the original issue. (cherry picked from commit bc473d5e68c0d7248c4fffae0579f229357d04cf) Conflicts: upnp/src/gena/gena_ctrlpt.c --- ChangeLog | 12 ++++++++++++ upnp/src/gena/gena_ctrlpt.c | 8 +++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1453138..63a01ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -299,6 +299,18 @@ Version 1.8.0 Version 1.6.16 ******************************************************************************* +2012-02-23 Marcelo Roberto Jimenez + + SF Bug Tracker id 3489999 - UpnpString leaks in genaSubscribe() + + Submitted: Yoichi NAKAYAMA ( yoichi ) - 2012-02-21 07:06:35 PST + + In genaSubscribe() (defined in upnp/src/gena/gena_ctrlpt.c), + ActualSID and EventURL will not be freed if ScheduleGenaAutoRenew + returns UPNP_E_SUCCESS. + + This fixes the original issue. + 2012-02-23 Marcelo Roberto Jimenez SF Bug Tracker: UpnpString leaks in genaSubscribe() diff --git a/upnp/src/gena/gena_ctrlpt.c b/upnp/src/gena/gena_ctrlpt.c index dff903d..6c7755d 100644 --- a/upnp/src/gena/gena_ctrlpt.c +++ b/upnp/src/gena/gena_ctrlpt.c @@ -563,11 +563,9 @@ int genaSubscribe( return_code = ScheduleGenaAutoRenew(client_handle, *TimeOut, newSubscription); error_handler: - if (return_code != UPNP_E_SUCCESS) { - UpnpString_delete(ActualSID); - UpnpString_delete(EventURL); - GenlibClientSubscription_delete(newSubscription); - } + UpnpString_delete(ActualSID); + UpnpString_delete(EventURL); + GenlibClientSubscription_delete(newSubscription); HandleUnlock(); SubscribeUnlock();