mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Properly check the capabilities count to avoid a segfault.
(ASA-2007-019) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@78375 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -202,9 +202,11 @@ struct station_capabilities {
|
||||
} payloads;
|
||||
};
|
||||
|
||||
#define SKINNY_MAX_CAPABILITIES 18
|
||||
|
||||
struct capabilities_res_message {
|
||||
uint32_t count;
|
||||
struct station_capabilities caps[18];
|
||||
struct station_capabilities caps[SKINNY_MAX_CAPABILITIES];
|
||||
};
|
||||
|
||||
#define SPEED_DIAL_STAT_REQ_MESSAGE 0x000A
|
||||
@@ -3459,11 +3461,15 @@ static int handle_capabilities_res_message(struct skinny_req *req, struct skinny
|
||||
{
|
||||
struct skinny_device *d = s->device;
|
||||
struct skinny_line *l;
|
||||
int count = 0;
|
||||
uint32_t count = 0;
|
||||
int codecs = 0;
|
||||
int i;
|
||||
|
||||
count = letohl(req->data.caps.count);
|
||||
if (count > SKINNY_MAX_CAPABILITIES) {
|
||||
count = SKINNY_MAX_CAPABILITIES;
|
||||
ast_log(LOG_WARNING, "Received more capabilities than we can handle (%d). Ignoring the rest.\n", SKINNY_MAX_CAPABILITIES);
|
||||
}
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
int acodec = 0;
|
||||
|
Reference in New Issue
Block a user