mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

GETTOKEN() macro did not set result, causing

Browse Source 
dns_master_load() to print messages like "dns_master_load: success".
Also, result of dns_time64_fromtext() was not checked.
This commit is contained in:
Andreas Gustafsson
2000-01-22 00:28:00 +00:00
parent 97a274369d
commit 68c703dd71
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dns/master.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: master.c,v 1.34 1999/12/23 00:08:29 explorer Exp $ */ /* $Id: master.c,v 1.35 2000/01/22 00:28:00 gson Exp $ */
#include <config.h> #include <config.h>
@@ -94,9 +94,8 @@ static isc_boolean_t on_list(dns_rdatalist_t *this, dns_rdata_t *rdata);
#define GETTOKEN(lexer, options, token, eol) \ #define GETTOKEN(lexer, options, token, eol) \
do { \ do { \
isc_result_t isc_r; \ result = gettoken(lexer, options, token, eol, callbacks); \
isc_r = gettoken(lexer, options, token, eol, callbacks); \ switch (result) { \
switch (isc_r) { \
case DNS_R_SUCCESS: \ case DNS_R_SUCCESS: \
break; \ break; \
case DNS_R_UNEXPECTED: \ case DNS_R_UNEXPECTED: \
@@ -131,7 +130,7 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token,
if (token->type == isc_tokentype_eol || if (token->type == isc_tokentype_eol ||
token->type == isc_tokentype_eof) { token->type == isc_tokentype_eof) {
(*callbacks->error)(callbacks, (*callbacks->error)(callbacks,
"dns_master_load: %s:%d unexpected end of %s\n", "dns_master_load: %s:%d: unexpected end of %s\n",
isc_lex_getsourcename(lex), isc_lex_getsourcename(lex),
isc_lex_getsourceline(lex), isc_lex_getsourceline(lex),
(token->type == (token->type ==
@@ -345,6 +344,8 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
isc_stdtime_get(&current_time); isc_stdtime_get(&current_time);
result = dns_time64_fromtext(token.value. result = dns_time64_fromtext(token.value.
as_pointer, &dump_time64); as_pointer, &dump_time64);
if (result != ISC_R_SUCCESS)
goto error_cleanup;
dump_time = (isc_stdtime_t)dump_time64; dump_time = (isc_stdtime_t)dump_time64;
if (dump_time != dump_time64) { if (dump_time != dump_time64) {
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
@@ -387,7 +388,6 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
token.value.as_region.length); token.value.as_region.length);
result = dns_name_fromtext(&new_name, &buffer, result = dns_name_fromtext(&new_name, &buffer,
&origin_name, ISC_FALSE, &name); &origin_name, ISC_FALSE, &name);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
goto error_cleanup; goto error_cleanup;