ucs2 is always a multiple of 2 bytes

this gets rid of a bunch of iconv warnings

diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index 49c4ba4063e4d3481c3b7037faba5be2ae5ee2bd..9bbb8a85078a54b8726858603a636a4d2bbebab8 100644 (file)
--- a/source/lib/charcnv.c
+++ b/source/lib/charcnv.c
@@ -255,6 +255,9 @@ int push_ucs2(const void *base_ptr, void *dest, const char *src, int dest_len, i
                len++;
        }
 
+       /* ucs2 is always a multiple of 2 bytes */
+       dest_len &= ~1;
+
        len += convert_string(&unix_to_ucs2, src, src_len, dest, dest_len);
        return len;
 }
@@ -285,6 +288,9 @@ int pull_ucs2(const void *base_ptr, char *dest, const void *src, int dest_len, i
 
        if (flags & STR_TERMINATE) src_len = strlen_w(src)*2+2;
 
+       /* ucs2 is always a multiple of 2 bytes */
+       src_len &= ~1;
+       
        ret = convert_string(&ucs2_to_unix, src, src_len, dest, dest_len);
        if (dest_len) dest[MIN(ret, dest_len-1)] = 0;