mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 22:35:25 +00:00
Code Issues Releases Wiki Activity

Rework pool parsing change to fix null dereference [rt16845]

Browse Source
This commit is contained in:
Evan Hunt
2007-05-03 21:24:38 +00:00
parent f546c28bf0
commit 75eaa6ffa2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/confpars.c
View File

@@ -34,7 +34,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: confpars.c,v 1.161 2007/04/27 22:36:26 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n"; "$Id: confpars.c,v 1.162 2007/05/03 21:24:38 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -1316,13 +1316,19 @@ void parse_pool_statement (cfile, group, type)
shared_network_reference (&pool -> shared_network, shared_network_reference (&pool -> shared_network,
group -> subnet -> shared_network, group -> subnet -> shared_network,
MDL); MDL);
else else if (type == SHARED_NET_DECL)
shared_network_reference (&pool -> shared_network, shared_network_reference (&pool -> shared_network,
group -> shared_network, MDL); group -> shared_network, MDL);
else {
parse_warn(cfile, "Dynamic pools are only valid inside "
"subnet or shared-network statements.");
skip_to_semi(cfile);
return;
}
if (group->shared_network == NULL || if (pool->shared_network == NULL ||
!clone_group (&pool -> group, pool -> shared_network -> group, MDL)) !clone_group(&pool->group, pool->shared_network->group, MDL))
log_fatal ("can't clone pool group."); log_fatal("can't clone pool group.");
#if defined (FAILOVER_PROTOCOL) #if defined (FAILOVER_PROTOCOL)
/* Inherit the failover peer from the shared network. */ /* Inherit the failover peer from the shared network. */