3027. [bug] Add documented REQUIREs to cfg_obj_asnetprefix() to

catch NULL pointer dereferences before they happen.
                        [RT #22521]
This commit is contained in:
Mark Andrews 2011-02-21 06:11:14 +00:00
parent 38e922db26
commit 2ed1583ad5
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,7 @@
3027. [bug] Add documented REQUIREs to cfg_obj_asnetprefix() to
catch NULL pointer dereferences before they happen.
[RT #22521]
3026. [bug] lib/isc/httpd.c: check that we have enough space
after calling grow_headerspace() and if not
re-call grow_headerspace() until we do. [RT #22521]

View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: parser.c,v 1.139 2011/01/04 23:47:14 tbox Exp $ */
/* $Id: parser.c,v 1.139.14.1 2011/02/21 06:11:14 marka Exp $ */
/*! \file */
@ -2006,8 +2006,12 @@ cfg_obj_isnetprefix(const cfg_obj_t *obj) {
void
cfg_obj_asnetprefix(const cfg_obj_t *obj, isc_netaddr_t *netaddr,
unsigned int *prefixlen) {
unsigned int *prefixlen)
{
REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_netprefix);
REQUIRE(netaddr != NULL);
REQUIRE(prefixlen != NULL);
*netaddr = obj->value.netprefix.address;
*prefixlen = obj->value.netprefix.prefixlen;
}