Commit 594eadcc authored by Evan Hunt's avatar Evan Hunt

[master] Add DLZ db version to activeversions

4628.	[bug]		Fixed a potential reference leak in query_getdb().
			[RT #45247]
parent 5f6aa595
4628. [bug] Fixed a potential reference leak in query_getdb().
[RT #45247]
4627. [placeholder]
4626. [test] Added more tests for handling of different record
......
......@@ -973,7 +973,7 @@ ns_query_init(ns_client_t *client) {
return (result);
}
static inline ns_dbversion_t *
static ns_dbversion_t *
query_findversion(ns_client_t *client, dns_db_t *db) {
ns_dbversion_t *dbversion;
......@@ -1476,6 +1476,8 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
zonelabels, &cm, &ci, &tdbp);
/* If we successful, we found a better match. */
if (tresult == ISC_R_SUCCESS) {
ns_dbversion_t *dbversion;
/*
* If the previous search returned a zone, detach it.
*/
......@@ -1494,15 +1496,16 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
*/
*versionp = NULL;
/*
* Get our database version.
*/
dns_db_currentversion(tdbp, versionp);
/*
* Be sure to return our database.
*/
*dbp = tdbp;
dbversion = query_findversion(client, tdbp);
if (dbversion == NULL) {
result = ISC_R_NOMEMORY;
} else {
/*
* Be sure to return our database.
*/
*dbp = tdbp;
*versionp = dbversion->version;
}
/*
* We return a null zone, No stats for DLZ zones.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment