Accept 'in=NULL' with 'inlen=0' in isc_{half}siphash24

Arthimetic on NULL pointers is undefined.  Avoid arithmetic operations
when 'in' is NULL and require 'in' to be non-NULL if 'inlen' is not zero.

(cherry picked from commit 349c23dbb7a4f3ffe29f3c9deff418aab6266fd0)

diff --git a/lib/isc/siphash.c b/lib/isc/siphash.c
index 1a863ff8e1d36369daf56bef1b0e1a05c91c14b2..a6e60cf02f0fbd4668cd533eadf7467112bd224e 100644 (file)
--- a/lib/isc/siphash.c
+++ b/lib/isc/siphash.c
@@ -91,6 +91,7 @@ isc_siphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
              uint8_t *out) {
        REQUIRE(k != NULL);
        REQUIRE(out != NULL);
+       REQUIRE(inlen == 0 || in != NULL);
 
        uint64_t k0 = U8TO64_LE(k);
        uint64_t k1 = U8TO64_LE(k + 8);
@@ -102,7 +103,9 @@ isc_siphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
 
        uint64_t b = ((uint64_t)inlen) << 56;
 
-       const uint8_t *end = in + inlen - (inlen % sizeof(uint64_t));
+       const uint8_t *end = (in == NULL)
+                                    ? NULL
+                                    : in + inlen - (inlen % sizeof(uint64_t));
        const size_t left = inlen & 7;
 
        for (; in != end; in += 8) {
@@ -169,6 +172,7 @@ isc_halfsiphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
                  uint8_t *out) {
        REQUIRE(k != NULL);
        REQUIRE(out != NULL);
+       REQUIRE(inlen == 0 || in != NULL);
 
        uint32_t k0 = U8TO32_LE(k);
        uint32_t k1 = U8TO32_LE(k + 4);
@@ -180,7 +184,9 @@ isc_halfsiphash24(const uint8_t *k, const uint8_t *in, const size_t inlen,
 
        uint32_t b = ((uint32_t)inlen) << 24;
 
-       const uint8_t *end = in + inlen - (inlen % sizeof(uint32_t));
+       const uint8_t *end = (in == NULL)
+                                    ? NULL
+                                    : in + inlen - (inlen % sizeof(uint32_t));
        const int left = inlen & 3;
 
        for (; in != end; in += 4) {