[asterisk-commits] trunk r17490 - in /trunk: ./ CREDITS enum.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Apr  5 01:52:41 2006
New Revision: 17490

URL: http://svn.digium.com/view/asterisk?rev=17490&view=rev
Log:
Issue #6654: Enum crash on ADDRESS record, possibly bad record, but still a crash (imported from 1.2)

Modified:
    trunk/   (props changed)
    trunk/CREDITS
    trunk/enum.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/CREDITS
URL: http://svn.digium.com/view/asterisk/trunk/CREDITS?rev=17490&r1=17489&r2=17490&view=diff
==============================================================================
--- trunk/CREDITS (original)
+++ trunk/CREDITS Wed Apr  5 01:52:41 2006
@@ -12,6 +12,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
 

Modified: trunk/enum.c
URL: http://svn.digium.com/view/asterisk/trunk/enum.c?rev=17490&r1=17489&r2=17490&view=diff
==============================================================================
--- trunk/enum.c (original)
+++ trunk/enum.c Wed Apr  5 01:52:41 2006
@@ -99,8 +99,8 @@
 	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)