Merge remote-tracking branch 'launchpad/3.14'

* launchpad/3.14:
  ioc/rsrv: bounds check DBR
This commit is contained in:
Michael Davidsaver
2017-05-03 16:53:43 -04:00

View File

@@ -777,6 +777,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 );
@@ -1889,6 +1893,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 );