p
/
termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better handling of incomplete UTF-8 sequences - just emit a UTF8_INVALID if waittime is up

This commit is contained in:
Paul LeoNerd Evans 2008-11-03 21:10:14 +00:00
parent 76147e92d4
commit a2f3d807f8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
termkey.c
View File

@ -440,8 +440,19 @@ static termkey_result getkey_simple(termkey_t *tk, termkey_key *key, int force)
return TERMKEY_RES_KEY; return TERMKEY_RES_KEY;
} }
if(tk->buffcount < nbytes) if(tk->buffcount < nbytes) {
return tk->waittime ? TERMKEY_RES_AGAIN : TERMKEY_RES_NONE; if(!force)
return TERMKEY_RES_AGAIN;
/* There weren't enough bytes for a complete UTF-8 sequence but caller
* demands an answer. About the best thing we can do here is eat as many
* bytes as we have, and emit a UTF8_INVALID. If the remaining bytes
* arrive later, they'll be invalid too.
*/
(*tk->method.emit_codepoint)(tk, UTF8_INVALID, key);
(*tk->method.eat_bytes)(tk, tk->buffcount);
return TERMKEY_RES_KEY;
}
for(int b = 1; b < nbytes; b++) { for(int b = 1; b < nbytes; b++) {
unsigned char cb = CHARAT(b); unsigned char cb = CHARAT(b);