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

SF Bug Tracker id 3497714 - Buffer overflows

Browse Source 
Fix compile error on WIN32.

Local variables must be declared first.
Remove outdated comment.
This commit is contained in:
Yoichi NAKAYAMA 2012-03-08 01:37:03 +09:00
parent 71ab707e81
commit 4c3532585d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -2,6 +2,15 @@
Version 1.6.16 Version 1.6.16
******************************************************************************* *******************************************************************************
2012-03-07 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
SF Bug Tracker id 3497714 - Buffer overflows
Fix compile error on WIN32.
Local variables must be declared first.
Remove outdated comment.
2012-03-07 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com> 2012-03-07 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Avoid access violation in assertion. Avoid access violation in assertion.

8
upnp/src/api/upnpapi.c
View File

@ -3448,12 +3448,10 @@ void UpnpThreadDistribution(struct UpnpNonblockParam *Param)
#if EXCLUDE_GENA == 0 #if EXCLUDE_GENA == 0
case SUBSCRIBE: { case SUBSCRIBE: {
struct Upnp_Event_Subscribe Evt; struct Upnp_Event_Subscribe Evt;
memset(&Evt, 0, sizeof(Evt));
/* Cast away constness */
/*UpnpString *Sid = (UpnpString *)UpnpEventSubscribe_get_SID(evt);*/
UpnpString *Sid = UpnpString_new(); UpnpString *Sid = UpnpString_new();
UpnpString *Url = UpnpString_new(); UpnpString *Url = UpnpString_new();
UpnpString_set_String(Url, Param->Url); UpnpString_set_String(Url, Param->Url);
memset(&Evt, 0, sizeof(Evt));
Evt.ErrCode = genaSubscribe( Evt.ErrCode = genaSubscribe(
Param->Handle, Param->Handle,
Url, Url,
@ -3472,9 +3470,9 @@ void UpnpThreadDistribution(struct UpnpNonblockParam *Param)
} }
case UNSUBSCRIBE: { case UNSUBSCRIBE: {
struct Upnp_Event_Subscribe Evt; struct Upnp_Event_Subscribe Evt;
memset(&Evt, 0, sizeof(Evt));
UpnpString *Sid = UpnpString_new(); UpnpString *Sid = UpnpString_new();
UpnpString_set_String(Sid, Param->SubsId); UpnpString_set_String(Sid, Param->SubsId);
memset(&Evt, 0, sizeof(Evt));
Evt.ErrCode = genaUnSubscribe( Evt.ErrCode = genaUnSubscribe(
Param->Handle, Param->Handle,
Sid); Sid);
@ -3489,9 +3487,9 @@ void UpnpThreadDistribution(struct UpnpNonblockParam *Param)
} }
case RENEW: { case RENEW: {
struct Upnp_Event_Subscribe Evt; struct Upnp_Event_Subscribe Evt;
memset(&Evt, 0, sizeof(Evt));
UpnpString *Sid = UpnpString_new(); UpnpString *Sid = UpnpString_new();
UpnpString_set_String(Sid, Param->SubsId); UpnpString_set_String(Sid, Param->SubsId);
memset(&Evt, 0, sizeof(Evt));
Evt.ErrCode = genaRenewSubscription( Evt.ErrCode = genaRenewSubscription(
Param->Handle, Param->Handle,
Sid, Sid,