commit 894e0b468dffc0c2f8f9380337304e5fd8cf1ea4
author Kaspar Schleiser <kaspar@schleiser.de> Fri Mar 16 15:33:00 2018 +0100
committer Kaspar Schleiser <kaspar@schleiser.de> Sat Mar 17 12:41:25 2018 +0100
tree 6889dd4cc55bcff6c3e8ad897a65e1c4ccb2b609
parent 9acd21befbdd2038a8fd3d07305fde77692ced0e

implement alignment-safe ntoh16p() && ntoh32p()

src/cn-cbor.c

diff --git a/src/cn-cbor.c b/src/cn-cbor.c
index a7677ae..400de5f 100644
--- a/src/cn-cbor.c
+++ b/src/cn-cbor.c
@@ -51,8 +51,18 @@
 
 /* Fix these if you can't do non-aligned reads */
 #define ntoh8p(p) (*(unsigned char*)(p))
-#define ntoh16p(p) (ntohs(*(unsigned short*)(p)))
-#define ntoh32p(p) (ntohl(*(unsigned long*)(p)))
+static uint16_t ntoh16p(unsigned char *p) {
+    uint16_t tmp;
+    memcpy(&tmp, p, sizeof(tmp));
+    return ntohs(tmp);
+}
+
+static uint32_t ntoh32p(unsigned char *p) {
+    uint32_t tmp;
+    memcpy(&tmp, p, sizeof(tmp));
+    return ntohl(tmp);
+}
+
 static uint64_t ntoh64p(unsigned char *p) {
   uint64_t ret = ntoh32p(p);
   ret <<= 32;