From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 29 Dec 2020 16:44:04 +0000 (+0900)
Subject: siphash: introduce siphash24_compress_safe()
X-Git-Tag: v248-rc1~444^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b71a7e01d8d04a3668c349e2320c42c786f2382;p=thirdparty%2Fsystemd.git

siphash: introduce siphash24_compress_safe()
---

diff --git a/src/basic/siphash24.h b/src/basic/siphash24.h
index 90a6de00e4f..0b3e845bf46 100644
--- a/src/basic/siphash24.h
+++ b/src/basic/siphash24.h
@@ -5,9 +5,9 @@
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <string.h>
 #include <sys/types.h>
 
+#include "string-util.h"
 #include "time-util.h"
 
 struct siphash {
@@ -33,11 +33,15 @@ static inline void siphash24_compress_usec_t(usec_t in, struct siphash *state) {
         siphash24_compress(&in, sizeof in, state);
 }
 
-static inline void siphash24_compress_string(const char *in, struct siphash *state) {
-        if (!in)
+static inline void siphash24_compress_safe(const void *in, size_t inlen, struct siphash *state) {
+        if (inlen == 0)
                 return;
 
-        siphash24_compress(in, strlen(in), state);
+        siphash24_compress(in, inlen, state);
+}
+
+static inline void siphash24_compress_string(const char *in, struct siphash *state) {
+        siphash24_compress_safe(in, strlen_ptr(in), state);
 }
 
 uint64_t siphash24_finalize(struct siphash *state);