Index: text.c
===================================================================
RCS file: /cvsroot/wv/text.c,v
retrieving revision 1.57
diff -u -r1.57 text.c
--- text.c	2000/11/18 02:39:06	1.57
+++ text.c	2000/11/18 03:39:24
@@ -242,10 +242,11 @@
         p = obuf;
 
 	wv_iconv(iconv_handle, &ibuf, &ibuflen, &obuf, &obuflen);
-	/* obuf = buffer2; */
+	/* obuf != buffer2; */
 	
-	/* legal because 2 * sizeof(U8) == sizeof(U16) */
-	eachchar = *(U16*)obuf;
+	/* We might have double byte char here. */
+	eachchar = (U16)buffer2[0] << 8;
+	eachchar |=(U16) buffer2[1];
 	iconv_close(iconv_handle);
 
 	return(eachchar);