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)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
10-digiumphones
Richard Mudgett 14 years ago
parent afc8368dea
commit e2b21c4942

@ -3770,7 +3770,7 @@ static void *do_monitor(void *data)
{ {
int res; int res;
int reloading; int reloading;
struct mgcp_gateway *g, *gprev, *gnext; struct mgcp_gateway *g, *gprev;
/*struct mgcp_gateway *g;*/ /*struct mgcp_gateway *g;*/
/*struct mgcp_endpoint *e;*/ /*struct mgcp_endpoint *e;*/
/*time_t thispass = 0, lastpass = 0;*/ /*time_t thispass = 0, lastpass = 0;*/
@ -3840,12 +3840,10 @@ static void *do_monitor(void *data)
g = gateways; g = gateways;
gprev = NULL; gprev = NULL;
while(g) { while(g) {
gnext = g->next;
if(g->realtime) { if(g->realtime) {
if(mgcp_prune_realtime_gateway(g)) { if(mgcp_prune_realtime_gateway(g)) {
if(gprev) { if(gprev) {
gprev->next = gnext; gprev->next = g->next;
gprev = g;
} else { } else {
gateways = g->next; gateways = g->next;
} }
@ -3859,7 +3857,7 @@ static void *do_monitor(void *data)
} else { } else {
gprev = g; gprev = g;
} }
g = gnext; g = g->next;
} }
ast_mutex_unlock(&gatelock); ast_mutex_unlock(&gatelock);
lastrun = time(NULL); lastrun = time(NULL);

Loading…
Cancel
Save