FIXED: Back skip over UTF-16. @uwer.

JanWielemaker · JanWielemaker · commit 3acd98e8f66e · 2023-01-18T10:48:59.000+01:00
diff --git a/utf8.h b/utf8.h
@@ -131,7 +131,7 @@ static inline const wchar_t*
 get_wchar_r(const wchar_t *in, int *chr)
 {
 #if SIZEOF_WCHAR_T == 2
-  if ( IS_UTF16_LEAD(-2) && IS_UTF16_TRAIL(in[-1]) )
+  if ( IS_UTF16_TRAIL(in[-1]) && IS_UTF16_LEAD(in[-2]) )
   { *chr = utf16_decode(in[-2], in[-1]);
     in -= 2;
   } else

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ static inline const wchar_t*`
`131`	`131`	`get_wchar_r(const wchar_t in, int chr)`
`132`	`132`	`{`
`133`	`133`	`#if SIZEOF_WCHAR_T == 2`
`134`		`- if ( IS_UTF16_LEAD(-2) && IS_UTF16_TRAIL(in[-1]) )`
	`134`	`+ if ( IS_UTF16_TRAIL(in[-1]) && IS_UTF16_LEAD(in[-2]) )`
`135`	`135`	`{ *chr = utf16_decode(in[-2], in[-1]);`
`136`	`136`	`in -= 2;`
`137`	`137`	`} else`