automerge commit

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

diff --git a/CREDITS b/CREDITS
index 8dc47d6bd0653aa8e330cc20930a1b669fa56212..659c84122f32bdb86d808b75507e0acb23fa8110 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -13,6 +13,8 @@ Telesthetic - for supporting SIP development
 
 Christos Ricudis - for substantial code contributions
 
+nic.at - ENUM support in Asterisk
+
 Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
 
 === WISHLIST CONTRIBUTERS ===

diff --git a/enum.c b/enum.c
index 5e11ed906f5f71d5c1e5df11423e08a4ce733df7..194f708ed74d2e2c841f26181f0e80465541a4a6 100644 (file)
--- a/enum.c
+++ b/enum.c
@@ -87,8 +87,8 @@ static int parse_ie(char *data, int maxdatalen, char *src, int srclen)
        len = olen = (int)src[0];
        src++;
        srclen--;
-       if (len > srclen) {
-               ast_log(LOG_WARNING, "Want %d, got %d\n", len, srclen);
+       if (len > srclen || len < 0 ) {
+               ast_log(LOG_WARNING, "ENUM parsing failed: Wanted %d characters, got %d\n", len, srclen);
                return -1;
        }
        if (len > maxdatalen)