- Fix Make Test Fails when Configured With --enable-alloc-nonregional,

  reported by X41 D-Sec.

diff --git a/doc/Changelog b/doc/Changelog
index 3a39748045c73aa94658e0ec84e633cd3b102b33..1378ad24143f698117566a00270d91732acc2d67 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
        - Fix lock type for memory purify log lock deletion.
        - Fix testbound for alloccheck runs, memory purify and lock checks.
        - update contrib/fastrpz.patch to apply more cleanly.
+       - Fix Make Test Fails when Configured With --enable-alloc-nonregional,
+         reported by X41 D-Sec.
 
 3 December 2019: Wouter
        - Merge pull request #124 from rmetrich: Changed log lock

diff --git a/testcode/unitregional.c b/testcode/unitregional.c
index 49c8147c944c6f3a4ae97a263411edb0963e2b62..d21e2caa366e6d311fb89882609d6947204c081d 100644 (file)
--- a/testcode/unitregional.c
+++ b/testcode/unitregional.c
@@ -50,7 +50,9 @@ corner_cases(struct regional* r)
        size_t s; /* shadow count of allocated memory */
        void* a;
        size_t minsize = sizeof(uint64_t);
+#ifndef UNBOUND_ALLOC_NONREGIONAL
        size_t mysize;
+#endif
        char* str;
        unit_assert(r);
        /* alloc cases:
@@ -75,6 +77,7 @@ corner_cases(struct regional* r)
        s+=0;
        unit_assert(r->available == r->first_size - s);
 
+#ifndef UNBOUND_ALLOC_NONREGIONAL
        a = regional_alloc(r, 1);
        unit_assert(a);
        memset(a, 0x42, 1);
@@ -171,6 +174,7 @@ corner_cases(struct regional* r)
        memset(a, 0x42, mysize);
        unit_assert(a);
        unit_assert(r->available == 8);
+#endif /* UNBOUND_ALLOC_NONREGIONAL */
 
        /* test if really copied over */
        str = "test12345";