generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SF Bug Tracker id 3489999 - UpnpString leaks in genaSubscribe()

Browse Source 
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
This commit is contained in:
Marcelo Roberto Jimenez 2012-02-26 01:19:47 -03:00
parent 5db582d3b9
commit 76c7fc26eb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -299,6 +299,18 @@ Version 1.8.0
Version 1.6.16 Version 1.6.16
******************************************************************************* *******************************************************************************
2012-02-23 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
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 <mroberto(at)users.sourceforge.net> 2012-02-23 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
SF Bug Tracker: UpnpString leaks in genaSubscribe() SF Bug Tracker: UpnpString leaks in genaSubscribe()

8
upnp/src/gena/gena_ctrlpt.c
View File

@ -563,11 +563,9 @@ int genaSubscribe(
return_code = ScheduleGenaAutoRenew(client_handle, *TimeOut, newSubscription); return_code = ScheduleGenaAutoRenew(client_handle, *TimeOut, newSubscription);
error_handler: error_handler:
if (return_code != UPNP_E_SUCCESS) { UpnpString_delete(ActualSID);
UpnpString_delete(ActualSID); UpnpString_delete(EventURL);
UpnpString_delete(EventURL); GenlibClientSubscription_delete(newSubscription);
GenlibClientSubscription_delete(newSubscription);
}
HandleUnlock(); HandleUnlock();
SubscribeUnlock(); SubscribeUnlock();