From: Joshua Colp <jcolp@digium.com>
Date: Mon, 18 Jun 2007 21:58:37 +0000 (+0000)
Subject: Merged revisions 69805 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cca0a6a8e476c305e35d551cb0227c7632953ee;p=thirdparty%2Fasterisk.git

Merged revisions 69805 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69805 | file | 2007-06-18 17:57:10 -0400 (Mon, 18 Jun 2007) | 2 lines

Fix for building on PowerPC under Linux.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/callerid.c b/main/callerid.c
index 1401bbbd92..6102d40af2 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -631,7 +631,8 @@ 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 */
+						res = cid->rawdata[x];
+						if (0 > res){	/* 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;