automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45350 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/LICENSE b/LICENSE
index a30b7941317660457b3f99e8a2151a043c4e9e2f..f8a4b2d2089f3bd7c2683cf82d656bafabe04067 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -5,6 +5,18 @@ applies to all loadable Asterisk modules used on your system as well,
 except as defined below. The GPL (version 2) is included in this
 source tree in the file COPYING.
 
+This package also includes various components that are not part of
+Asterisk itself; these components are in the 'contrib' directory
+and its subdirectories. Most of these components are also
+distributed under the GPL version 2 as well, except for the following:
+
+contrib/firmware/iax/iaxy.bin:
+       This file is Copyright (C) Digium, Inc. and is licensed for
+       use with Digium IAXy hardware devices only. It can be
+       distributed freely as long as the distribution is in the
+       original form present in this package (not reformatted or
+       modified).
+
 Digium, Inc. (formerly Linux Support Services) holds copyright
 and/or sufficient licenses to all components of the Asterisk
 package, and therefore can grant, at its sole discretion, the ability

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index c5f148726a1bb3b5b97f8f7570189a7f4187abdb..8291f8b7b60e80c2e441ba1a29bf194a39025b32 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2863,6 +2863,10 @@ static int get_input(struct skinnysession *s)
                        return -1;
                }
                dlen = letohl(*(int *)s->inbuf);
+               if (dlen < 0) {
+                       ast_log(LOG_WARNING, "Skinny Client sent invalid data.\n");
+                       return -1;
+               }
                if (dlen+8 > sizeof(s->inbuf)) {
                        dlen = sizeof(s->inbuf) - 8;
                }