2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00

Remove redundant 'version == NULL' check

*** CID 318094:  Null pointer dereferences  (REVERSE_INULL)
    /lib/dns/rbtdb.c: 1389 in newversion()
    1383     	version->xfrsize = rbtdb->current_version->xfrsize;
    1384     	RWUNLOCK(&rbtdb->current_version->rwlock, isc_rwlocktype_read);
    1385     	rbtdb->next_serial++;
    1386     	rbtdb->future_version = version;
    1387     	RBTDB_UNLOCK(&rbtdb->lock, isc_rwlocktype_write);
    1388
       CID 318094:  Null pointer dereferences  (REVERSE_INULL)
       Null-checking "version" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
    1389     	if (version == NULL) {
    1390     		return (result);
    1391     	}
    1392
    1393     	*versionp = version;
    1394
This commit is contained in:
Mark Andrews
2021-02-03 16:38:29 +11:00
committed by Ondřej Surý
parent adf5051afc
commit 456d53d1fb

View File

@@ -1347,7 +1347,6 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial,
static isc_result_t static isc_result_t
newversion(dns_db_t *db, dns_dbversion_t **versionp) { newversion(dns_db_t *db, dns_dbversion_t **versionp) {
isc_result_t result = ISC_R_SUCCESS;
dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
rbtdb_version_t *version; rbtdb_version_t *version;
@@ -1386,10 +1385,6 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) {
rbtdb->future_version = version; rbtdb->future_version = version;
RBTDB_UNLOCK(&rbtdb->lock, isc_rwlocktype_write); RBTDB_UNLOCK(&rbtdb->lock, isc_rwlocktype_write);
if (version == NULL) {
return (result);
}
*versionp = version; *versionp = version;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);