]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
delay assignment until after REQUIRE
authorMark Andrews <marka@isc.org>
Thu, 30 Jan 2020 08:38:47 +0000 (19:38 +1100)
committerMatthijs Mekking <matthijs@isc.org>
Wed, 5 Feb 2020 08:08:35 +0000 (09:08 +0100)
(cherry picked from commit d6de520bd15b0bf4114a1176240bbdde99002a6a)

lib/dns/tests/rbt_serialize_test.c

index 51ebffc5b3448c5545a62a0fc50154813b7e4a19..e150538be0f37b0371d42e294120625068171bfc 100644 (file)
@@ -133,7 +133,7 @@ static isc_result_t
 write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc) {
        isc_result_t result;
        size_t ret = 0;
-       data_holder_t *data = (data_holder_t *)datap;
+       data_holder_t *data;
        data_holder_t temp;
        off_t where;
 
@@ -141,7 +141,8 @@ write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc) {
 
        REQUIRE(file != NULL);
        REQUIRE(crc != NULL);
-       REQUIRE(data != NULL);
+       REQUIRE(datap != NULL);
+       data = (data_holder_t *)datap;
        REQUIRE((data->len == 0 && data->data == NULL) ||
                (data->len != 0 && data->data != NULL));