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

Check whether files are zero length before parsing them [rt17757]

Browse Source
This commit is contained in:
Evan Hunt
2008-03-07 20:12:44 +00:00
parent e6270e4f99
commit c40e954c55
8 changed files with 91 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/dhcpd.c
View File

@@ -612,20 +612,21 @@ main(int argc, char **argv) {
#if defined (NSUPDATE)
/* Set up the standard name service updater routine. */
parse = (struct parse *)0;
status = new_parse (&parse, -1,
std_nsupdate, (sizeof std_nsupdate) - 1,
parse = NULL;
status = new_parse(&parse, -1, std_nsupdate, sizeof(std_nsupdate) - 1,
"standard name service update routine", 0);
if (status != ISC_R_SUCCESS)
log_fatal ("can't begin parsing name service updater!");
lose = 0;
if (!(parse_executable_statements
(&root_group -> statements, parse, &lose, context_any))) {
end_parse (&parse);
log_fatal ("can't parse standard name service updater!");
if (parse != NULL) {
lose = 0;
if (!(parse_executable_statements(&root_group->statements,
parse, &lose, context_any))) {
end_parse(&parse);
log_fatal("can't parse standard name service updater!");
}
end_parse(&parse);
}
end_parse (&parse);
#endif
/* Initialize icmp support... */
@@ -1129,20 +1130,22 @@ void postconf_initialization (int quiet)
}
/* Set up the standard name service updater routine. */
parse = (struct parse *)0;
result = new_parse (&parse, -1,
old_nsupdate, (sizeof old_nsupdate) - 1,
"old name service update routine", 0);
parse = NULL;
result = new_parse(&parse, -1, old_nsupdate,
sizeof(old_nsupdate) - 1,
"old name service update routine", 0);
if (result != ISC_R_SUCCESS)
log_fatal ("can't begin parsing old ddns updater!");
tmp = 0;
if (!(parse_executable_statements (e, parse,
&tmp, context_any))) {
end_parse (&parse);
log_fatal ("can't parse standard ddns updater!");
if (parse != NULL) {
tmp = 0;
if (!(parse_executable_statements(e, parse, &tmp,
context_any))) {
end_parse(&parse);
log_fatal("can't parse standard ddns updater!");
}
}
end_parse (&parse);
end_parse(&parse);
}
#endif
}