From ea954e241155cd964361151e8a4f13a77d34f171 Mon Sep 17 00:00:00 2001
From: dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 10 May 2007 21:25:05 +0000
Subject: Added check for negative offset in cid spill to prevent infinite
 loops

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@63786 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/callerid.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'main')

diff --git a/main/callerid.c b/main/callerid.c
index 002666aa9..74b8d9200 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -636,6 +636,12 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, int
 						default:
 							ast_log(LOG_NOTICE, "Unknown IE %d\n", cid->rawdata[x - 1]);
 						}
+						if(0 > cid->rawdata[x]){	/* Negative offset in the CID Spill */
+							ast_log(LOG_NOTICE, "IE %d has bad field length of %d at offset %d\n", cid->rawdata[x-1], cid->rawdata[x], x);
+							/* Try again */
+							cid->sawflag = 0;
+							break; 	/* Exit the loop */
+						}
 						x += cid->rawdata[x];
 						x++;
 					}
-- 
cgit v1.2.3