From: Jason Parker <jparker@digium.com>
Date: Tue, 7 Aug 2007 18:26:19 +0000 (+0000)
Subject: Merged revisions 78375 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1786
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=395243c9238ca2ca831fc767e47e5fac24495e72;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@78378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 48c1578d45..bc1e733226 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;