rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-12-21 16:46:24 -05:00
Code Releases Activity

utf8: make sure to honor the array length properly

Browse Source 
Right now the input side can give partial utf8 input, and that showed
that we didn't properly handle that case.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2012-07-10 17:56:53 -07:00
parent 3c7bd9a7d2
commit 3abd3dba42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utf8.c
View File

@ -41,13 +41,13 @@ unsigned utf8_to_unicode(char *line, unsigned index, unsigned len, unicode_t *re
/* Invalid? Do it as a single byte Latin1 */ /* Invalid? Do it as a single byte Latin1 */
if (bytes > 6) if (bytes > 6)
return 1; return 1;
if (bytes > len)
return 1;
value = c & (mask-1); value = c & (mask-1);
/* Ok, do the bytes */ /* Ok, do the bytes */
for (i = 1; i < bytes; i++) { for (i = 1; i < bytes; i++) {
if (i > len)
return 1;
c = line[i]; c = line[i];
if ((c & 0xc0) != 0x80) if ((c & 0xc0) != 0x80)
return 1; return 1;