[asterisk-commits] rmudgett: trunk r315350 - in /trunk: ./ channels/chan_mgcp.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Apr 25 16:55:00 2011
New Revision: 315350

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

........
  r315349 | rmudgett | 2011-04-25 16:49:00 -0500 (Mon, 25 Apr 2011) | 9 lines
  
  When using MGCP realtime gateway definitions, random crashes occur.
  
  Fixed incorrect linked list node removal for realtime gateways.
  
  (closes issue #18291)
  Reported by: nahuelgreco
  Patches:
        dangling-pointers-when-pruning.patch uploaded by nahuelgreco (license 162)
........

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=315350&r1=315349&r2=315350
==============================================================================
--- trunk/channels/chan_mgcp.c (original)
+++ trunk/channels/chan_mgcp.c Mon Apr 25 16:55:00 2011
@@ -3770,7 +3770,7 @@
 {
 	int res;
 	int reloading;
-	struct mgcp_gateway *g, *gprev, *gnext;
+	struct mgcp_gateway *g, *gprev;
 	/*struct mgcp_gateway *g;*/
 	/*struct mgcp_endpoint *e;*/
 	/*time_t thispass = 0, lastpass = 0;*/
@@ -3840,12 +3840,10 @@
 			g = gateways;
 			gprev = NULL;
 			while(g) {
-				gnext = g->next;
 				if(g->realtime) {
 					if(mgcp_prune_realtime_gateway(g)) {
 						if(gprev) {
-							gprev->next = gnext;
-							gprev = g;
+							gprev->next = g->next;
 						} else {
 							gateways = g->next;
 						}
@@ -3859,7 +3857,7 @@
 				} else {
 					gprev = g;
 				}
-				g = gnext;
+				g = g->next;
 			}
 			ast_mutex_unlock(&gatelock);
 			lastrun = time(NULL);