Bug fix in UTF-8 fixup code - did not handle IAC IAC properly

nickgammon · nickgammon · commit 99a11aca666c · 2014-05-28T15:41:06.000+10:00
diff --git a/doc.cpp b/doc.cpp
@@ -2118,7 +2118,7 @@ CString strLine (lpszText, size);
 
     // do not display UTF-8 characters until they have completely arrived
     // check if high-order bit is set
-    if (m_bUTF_8 && (c & 0x80) && c != IAC)
+    if (!(flags & NOTE_OR_COMMAND) && m_bUTF_8 && (c & 0x80) && (c != IAC || m_phase == HAVE_IAC))
       {
       m_UTF8Sequence [0] = c;
       m_UTF8Sequence [1] = 0;  // null terminator

Original file line number	Diff line number	Diff line change
`@@ -2118,7 +2118,7 @@ CString strLine (lpszText, size);`
`2118`	`2118`
`2119`	`2119`	`// do not display UTF-8 characters until they have completely arrived`
`2120`	`2120`	`// check if high-order bit is set`
`2121`		`- if (m_bUTF_8 && (c & 0x80) && c != IAC)`
	`2121`	`+ if (!(flags & NOTE_OR_COMMAND) && m_bUTF_8 && (c & 0x80) && (c != IAC \|\| m_phase == HAVE_IAC))`
`2122`	`2122`	`{`
`2123`	`2123`	`m_UTF8Sequence [0] = c;`
`2124`	`2124`	`m_UTF8Sequence [1] = 0; // null terminator`