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

don't reference through potentially NULL callback pointers.

Browse Source
This commit is contained in:
Mark Andrews
2002-02-11 22:30:28 +00:00
parent 268755d803
commit b6a0341bcb
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/dns/rdata.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdata.c,v 1.158 2002/01/21 01:07:16 marka Exp $ */ /* $Id: rdata.c,v 1.159 2002/02/11 22:30:28 marka Exp $ */
#include <config.h> #include <config.h>
#include <ctype.h> #include <ctype.h>
@@ -193,11 +193,19 @@ getquad(const void *src, struct in_addr *dst,
result = inet_aton(src, dst); result = inet_aton(src, dst);
if (result == 1 && callbacks != NULL && if (result == 1 && callbacks != NULL &&
inet_pton(AF_INET, src, &tmp) != 1) { inet_pton(AF_INET, src, &tmp) != 1) {
(*callbacks->warn)(callbacks, "%s:%lu: warning \"%s\" " void (*callback)(dns_rdatacallbacks_t *, const char *, ...);
"is not a decimal dotted quad", const char *name;
isc_lex_getsourcename(lexer),
isc_lex_getsourceline(lexer), if (callbacks != NULL && callbacks->warn != NULL)
src); callback = callbacks->warn;
else
callback = default_fromtext_callback;
name = isc_lex_getsourcename(lexer);
if (name == NULL)
name = "UNKNOWN";
(*callback)(callbacks, "%s:%lu: warning \"%s\" "
"is not a decimal dotted quad", name,
isc_lex_getsourceline(lexer), src);
} }
return (result); return (result);
} }
@@ -681,12 +689,9 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
st = *target; st = *target;
if (callbacks == NULL) if (callbacks != NULL && callbacks->error != NULL)
callback = NULL;
else
callback = callbacks->error; callback = callbacks->error;
else
if (callback == NULL)
callback = default_fromtext_callback; callback = default_fromtext_callback;
result = isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring, result = isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring,
@@ -1939,11 +1944,18 @@ default_fromtext_callback(dns_rdatacallbacks_t *callbacks, const char *fmt,
static void static void
fromtext_warneof(isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks) { fromtext_warneof(isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks) {
if (isc_lex_isfile(lexer) && callbacks != NULL) if (isc_lex_isfile(lexer) && callbacks != NULL) {
(*callbacks->warn)(callbacks, void (*callback)(dns_rdatacallbacks_t *, const char *, ...);
"%s:%lu: file does not end with newline",
isc_lex_getsourcename(lexer), if (callbacks->warn != NULL)
isc_lex_getsourceline(lexer)); callback = callbacks->warn;
else
callback = default_fromtext_callback;
(*callback)(callbacks,
"%s:%lu: file does not end with newline",
isc_lex_getsourcename(lexer),
isc_lex_getsourceline(lexer));
}
} }
static void static void