mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-30 07:41:39 +00:00
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/branches/1.8@315349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3754,7 +3754,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;*/
|
||||||
@@ -3824,12 +3824,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;
|
||||||
}
|
}
|
||||||
@@ -3843,7 +3841,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);
|
||||||
|
|||||||
Reference in New Issue
Block a user