upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 17:30:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'v9_10' of /proj/git/prod/bind9 into v9_10

Browse source
This commit is contained in:
Tinderbox User 2014-06-12 01:15:44 +00:00
commit 7b094389de
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/dns/rdata/generic/hip_55.c
View file

@ -318,6 +318,8 @@ tostruct_hip(ARGS_TOSTRUCT) {
goto cleanup;
isc_region_consume(&region, hip->hit_len);
INSIST(hip->key_len <= region.length);
hip->key = mem_maybedup(mctx, region.base, hip->key_len);
if (hip->key == NULL)
goto cleanup;

2
lib/dns/rdata/generic/tkey_249.c
View file

@ -465,6 +465,7 @@ tostruct_tkey(ARGS_TOSTRUCT) {
/*
* Key.
*/
INSIST(tkey->keylen + 2U <= sr.length);
tkey->key = mem_maybedup(mctx, sr.base, tkey->keylen);
if (tkey->key == NULL)
goto cleanup;
@ -479,6 +480,7 @@ tostruct_tkey(ARGS_TOSTRUCT) {
/*
* Other.
*/
INSIST(tkey->otherlen <= sr.length);
tkey->other = mem_maybedup(mctx, sr.base, tkey->otherlen);
if (tkey->other == NULL)
goto cleanup;