mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 23:01:24 +02:00
Code Issues Projects Releases Wiki Activity

[BUG] peers: don't keep a peers section which has a NULL frontend

Browse Source 
If a peers section has no peer named as the local peer, we must destroy
it, otherwise a NULL peer frontend remains in the lists and a segfault
can happen upon a soft restart.

We also now report the missing peer name in order to help troubleshooting.
This commit is contained in:
Willy Tarreau 2011-09-07 21:24:49 +02:00
parent ce8fe259b5
commit 122541c06a
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/cfgparse.c
View File

@ -5870,8 +5870,8 @@ int check_config_validity()
cfgerr++; cfgerr++;
} }
else if (!curpeers->peers_fe) { else if (!curpeers->peers_fe) {
Alert("Proxy '%s': unable to identify local peer in peers section '%s'.\n", Alert("Proxy '%s': unable to find local peer '%s' in peers section '%s'.\n",
curproxy->id, curpeers->id); curproxy->id, localpeer, curpeers->id);
cfgerr++; cfgerr++;
} }
} }
@ -6553,6 +6553,43 @@ out_uri_auth_compat:
global.last_checks |= cfg_opts2[optnum].checks; global.last_checks |= cfg_opts2[optnum].checks;
} }
if (peers) {
struct peers *curpeers = peers, **last;
struct peer *p, *pb;
/* Remove all peers sections which don't have a valid listener.
* This can happen when a peers section is never referenced and
* does not contain a local peer.
*/
last = &peers;
while (*last) {
curpeers = *last;
if (curpeers->peers_fe) {
last = &curpeers->next;
continue;
}
Warning("Removing incomplete section 'peers %s' (no peer named '%s').\n",
curpeers->id, localpeer);
p = curpeers->remote;
while (p) {
pb = p->next;
free(p->id);
free(p);
p = pb;
}
/* Destroy and unlink this curpeers section.
* Note: curpeers is backed up into *last.
*/
free(curpeers->id);
curpeers = curpeers->next;
free(*last);
*last = curpeers;
}
}
if (cfgerr > 0) if (cfgerr > 0)
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
out: out: