diff --git a/src/htsmsg.c b/src/htsmsg.c
index 52cd5ddd7..5c323e36b 100644
--- a/src/htsmsg.c
+++ b/src/htsmsg.c
@@ -118,6 +118,7 @@ htsmsg_field_add(htsmsg_t *msg, const char *name, int type, int flags, size_t es
   htsmsg_field_t *f;

   nsize = name ? strlen(name) + 1 : 1;
+  nsize = (nsize + sizeof(int) - 1) & ~(sizeof(int) - 1);
   f = malloc(sizeof(htsmsg_field_t) + nsize + esize);
   if(f == NULL)
     return NULL;



diff --git a/src/htsmsg_binary2.c b/src/htsmsg_binary2.c
index a85aab81e..8c669f5a5 100644
--- a/src/htsmsg_binary2.c
+++ b/src/htsmsg_binary2.c
@@ -114,6 +114,7 @@ htsmsg_binary2_des0(htsmsg_t *msg, const uint8_t *buf, uint32_t len)
       return -1;

     nlen = namelen ? namelen + 1 : 1;
+    nlen = (nlen + sizeof(int) - 1) & ~(sizeof(int) - 1);
     tlen = sizeof(htsmsg_field_t) + nlen;
     if (type == HMF_STR) {
       tlen += datalen + 1;