[asterisk-commits] tilghman: trunk r280880 - in /trunk: ./ channels/chan_mgcp.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Aug  4 09:05:11 2010
New Revision: 280880

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280880
Log:
Merged revisions 280879 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280879 | tilghman | 2010-08-04 09:04:07 -0500 (Wed, 04 Aug 2010) | 14 lines
  
  Check cur value before attempting a deref.
  
  (closes issue #17775)
   Reported by: svinson
   Patches: 
         20100804__issue17775.diff.txt uploaded by tilghman (license 14)
   Tested by: svinson
  
  (closes issue #17743)
   Reported by: tgruenberg
   Patches: 
         20100804__issue17775.diff.txt uploaded by tilghman (license 14)
   Tested by: tgruenberg
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_mgcp.c

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

Modified: trunk/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_mgcp.c?view=diff&rev=280880&r1=280879&r2=280880
==============================================================================
--- trunk/channels/chan_mgcp.c (original)
+++ trunk/channels/chan_mgcp.c Wed Aug  4 09:05:11 2010
@@ -3580,7 +3580,7 @@
 	if (sscanf(req->identifier, "%30d", &seqno) != 1) {
 		seqno = 0;
 	}
-	for (cur = sub->parent->parent->responses, next = cur->next; cur; cur = next, next = cur->next) {
+	for (cur = sub->parent->parent->responses, next = cur ? cur->next : NULL; cur; cur = next, next = cur ? cur->next : NULL) {
 		if (now - cur->whensent > RESPONSE_TIMEOUT) {
 			/* Delete this entry */
 			if (prev)