diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 18:26:19 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 18:26:19 +0000 |
| commit | 12fd31de8b834bccc84ab4a16e68fe82b7cf62a8 (patch) | |
| tree | 9c04d8d5b1f2b66ff2c7930cb72f3398167cd222 /channels/chan_skinny.c | |
| parent | a4b09e8d28ad6e5a3a51b8fbb1771ad7e654463c (diff) | |
Merged revisions 78375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r78375 | qwell | 2007-08-07 13:25:15 -0500 (Tue, 07 Aug 2007) | 3 lines
Properly check the capabilities count to avoid a segfault.
(ASA-2007-019)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@78378 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 48c1578d4..bc1e73322 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -221,9 +221,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 @@ -3746,11 +3748,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; |