automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@17529 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 4 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index 8dc47d6bd..659c84122 100644
--- 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 5e11ed906..194f708ed 100644
--- 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)