diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2012-04-05 04:29:35 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2012-04-05 04:29:35 +0000 |
| commit | d0f6280db790de2ad69bd01a1275e350cbd2840d (patch) | |
| tree | cf3176c0801c94a4f298353cc450f10cf1aae9c0 /contrib/bind9/lib/dns/rriterator.c | |
| parent | 8931e524bfb5c6a10894f704e3eaa05ee5d9fa77 (diff) | |
| parent | 42d3eba523963ab015ac451eeea0788b11631c94 (diff) | |
Update to version 9.8.2, the latest from ISC, which contains numerous bug fixes.
Notes
Notes:
svn path=/head/; revision=233914
Diffstat (limited to 'contrib/bind9/lib/dns/rriterator.c')
| -rw-r--r-- | contrib/bind9/lib/dns/rriterator.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/bind9/lib/dns/rriterator.c b/contrib/bind9/lib/dns/rriterator.c index 31d67afd9311..509fb42270f3 100644 --- a/contrib/bind9/lib/dns/rriterator.c +++ b/contrib/bind9/lib/dns/rriterator.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rriterator.c,v 1.2 2009-06-30 02:52:32 each Exp $ */ +/* $Id$ */ /*! \file */ @@ -187,6 +187,8 @@ dns_rriterator_current(dns_rriterator_t *it, dns_name_t **name, REQUIRE(name != NULL && *name == NULL); REQUIRE(VALID_RRITERATOR(it)); REQUIRE(it->result == ISC_R_SUCCESS); + REQUIRE(rdataset == NULL || *rdataset == NULL); + REQUIRE(rdata == NULL || *rdata == NULL); *name = dns_fixedname_name(&it->fixedname); *ttl = it->rdataset.ttl; @@ -194,9 +196,9 @@ dns_rriterator_current(dns_rriterator_t *it, dns_name_t **name, dns_rdata_reset(&it->rdata); dns_rdataset_current(&it->rdataset, &it->rdata); - if (rdataset) + if (rdataset != NULL) *rdataset = &it->rdataset; - if (rdata) + if (rdata != NULL) *rdata = &it->rdata; } |