Ticket #1730: mc-4.7.5.5-mcviewutf8fix.patch

src/viewer/datasource.c

@@ -164 +164 @@
     int res = -1;
     gunichar ch;
     gchar *next_ch = NULL;
+    gchar utf8buf[6 + 1];
 
     *char_width = 0;
     *result = FALSE;
@@ -189 +190 @@
 
     res = g_utf8_get_char_validated (str, -1);
 
+    if (res < 0)
+    {
+        /* Retry with explicit bytes to make sure it's not a buffer boundary */
+        int i;
+        for (i = 0; i < 6; i++)
+            if (mcview_get_byte (view, byte_index + i, &res))
+                utf8buf[i] = res;
+            else
+                utf8buf[i] = '\0';
+        utf8buf[6] = '\0';
+        str = utf8buf;
+        res = g_utf8_get_char_validated (str, -1);
+    }
+
     if (res < 0)
     {
         ch = *str;