Merge remote-tracking branch 'launchpad/3.15'

* launchpad/3.15:
  ioc/rsrv: bounds check DBR
This commit is contained in:
Michael Davidsaver
2017-05-03 17:06:51 -04:00

View File

@@ -718,6 +718,10 @@ static int read_notify_action ( caHdrLargeArray *mp, void *pPayload, struct clie
struct channel_in_use *pciu;
struct event_ext evext;
if ( INVALID_DB_REQ(mp->m_dataType) ) {
return RSRV_ERROR;
}
pciu = MPTOPCIU ( mp );
if ( !pciu ) {
logBadId ( client, mp, pPayload );
@@ -1780,6 +1784,10 @@ static int event_add_action (caHdrLargeArray *mp, void *pPayload, struct client
struct channel_in_use *pciu;
struct event_ext *pevext;
if ( INVALID_DB_REQ(mp->m_dataType) ) {
return RSRV_ERROR;
}
pciu = MPTOPCIU ( mp );
if ( ! pciu ) {
logBadId ( client, mp, pPayload );