Fix unaligned data reference in LZS

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Feb 27, 2015 · c786621 · c786621
1 parent 5552b96
commit c786621
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lzs.c b/lzs.c
@@ -179,7 +179,7 @@ int lzs_compress(unsigned char *dst, int dstlen, const unsigned char *src, int s
 	 */
 #define HASH_BITS 16
 #define HASH_TABLE_SIZE (1ULL << HASH_BITS)
-#define HASH(p) (*(uint16_t *)(p))
+#define HASH(p) (((struct oc_packed_uint16_t *)p)->d)
 
 	/*
 	 * There are two data structures for tracking the history. The first

diff --git a/lzstest.c b/lzstest.c
@@ -17,6 +17,10 @@
 
 #define __OPENCONNECT_INTERNAL_H__
 
+struct oc_packed_uint16_t {
+	unsigned short d;
+} __attribute__((packed));
+
 int lzs_decompress(unsigned char *dst, int dstlen, const unsigned char *src, int srclen);
 int lzs_compress(unsigned char *dst, int dstlen, const unsigned char *src, int srclen);