From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Feb 2015 13:40:55 +0000 (-0500)
Subject: Have tinytest tolerate systems where char has > 8 bytes
X-Git-Tag: tor-0.2.6.3-alpha~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7620c613e8bdaa34120136c91f71ae0cf8cb8506;p=thirdparty%2Ftor.git

Have tinytest tolerate systems where char has > 8 bytes

CID 1064418
---

diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c
index cc054ad340..f6baeeb9a5 100644
--- a/src/ext/tinytest.c
+++ b/src/ext/tinytest.c
@@ -490,7 +490,7 @@ tinytest_format_hex_(const void *val_, unsigned long len)
 		return strdup("<allocation failure>");
 	cp = result;
 	for (i=0;i<len;++i) {
-		*cp++ = "0123456789ABCDEF"[val[i] >> 4];
+		*cp++ = "0123456789ABCDEF"[(val[i] >> 4)&0x0f];
 		*cp++ = "0123456789ABCDEF"[val[i] & 0x0f];
 	}
 	while (ellipses--)