Fix session cache misses and failed unit tests on MIPS

virtueistheonlygood · Jan 16, 2018 · f7e5c08 · f7e5c08
1 parent a631f81
commit f7e5c08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,8 @@
 
 ### SSLsplit develop
 
+-   Fix session cache misses and failed unit tests on MIPS by fixing undefined
+    behaviour in session cache hash functions (Debian #848919 and #851271).
 -   Synthesize MAC addresses to avoid the requirement for root privileges and
     waiting for ARP timeouts on some platforms in log2pcap.py (issue #169).
 -   Add -M for writing an SSLKEYLOGFILE compatible log file (issue #184).

diff --git a/cachedsess.c b/cachedsess.c
@@ -44,13 +44,11 @@ static inline khint_t
 kh_dynbuf_hash_func(dynbuf_t *b)
 {
 	khint_t *p = (khint_t *)b->buf;
-	khint_t h;
+	khint_t h = 0;
 	int rem;
 
 	if ((rem = b->sz % sizeof(khint_t))) {
 		memcpy(&h, b->buf + b->sz - rem, rem);
-	} else {
-		h = 0;
 	}
 
 	while (p < (khint_t*)(b->buf + b->sz - rem)) {

diff --git a/cachessess.c b/cachessess.c
@@ -42,13 +42,11 @@ static inline khint_t
 kh_dynbuf_hash_func(dynbuf_t *b)
 {
 	khint_t *p = (khint_t *)b->buf;
-	khint_t h;
+	khint_t h = 0;
 	int rem;
 
 	if ((rem = b->sz % sizeof(khint_t))) {
 		memcpy(&h, b->buf + b->sz - rem, rem);
-	} else {
-		h = 0;
 	}
 
 	while (p < (khint_t*)(b->buf + b->sz - rem)) {