Merge branch '936-missing-unlocks-in-sdlz-c-v9_14' into 'v9_14'

Resolve "Missing unlocks in sdlz.c"

See merge request isc-projects/bind9!1679
This commit is contained in:
Mark Andrews 2019-03-13 20:08:10 -04:00
commit d8ef8b5658
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,5 @@
5184. [bug] Missing unlocks in sdlz.c. [GL #936]
5183. [bug] Reinitialize ECS data before reusing client
structures. [GL #881]

View file

@ -624,15 +624,19 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create,
result = dns_name_concatenate(dns_wildcardname,
fname, fname,
NULL);
if (result != ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
MAYBE_UNLOCK(sdlz->dlzimp);
return (result);
}
wild = fname;
}
isc_buffer_init(&b, wildstr, sizeof(wildstr));
result = dns_name_totext(wild, true, &b);
if (result != ISC_R_SUCCESS)
if (result != ISC_R_SUCCESS) {
MAYBE_UNLOCK(sdlz->dlzimp);
return (result);
}
isc_buffer_putuint8(&b, 0);
result = sdlz->dlzimp->methods->lookup(zonestr, wildstr,