mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.714

Browse Source 
Problem:    Illegal memory access when there are illegal bytes.
Solution:   Check the byte length of the character. (Dominique Pelle)

069dd08d8d
This commit is contained in:
Michael Ennen
2016-01-13 16:01:23 -07:00
parent 573d65c738
commit 39ef219535
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/regexp.c
View File

@@ -5333,10 +5333,12 @@ do_class:
if ((len = (*mb_ptr2len)(opnd)) > 1) { if ((len = (*mb_ptr2len)(opnd)) > 1) {
if (ireg_ic && enc_utf8) if (ireg_ic && enc_utf8)
cf = utf_fold(utf_ptr2char(opnd)); cf = utf_fold(utf_ptr2char(opnd));
while (count < maxcount) { while (count < maxcount && (*mb_ptr2len)(scan) >= len) {
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i) {
if (opnd[i] != scan[i]) if (opnd[i] != scan[i]) {
break; break;
}
}
if (i < len && (!ireg_ic || !enc_utf8 if (i < len && (!ireg_ic || !enc_utf8
|| utf_fold(utf_ptr2char(scan)) != cf)) || utf_fold(utf_ptr2char(scan)) != cf))
break; break;

2
src/nvim/version.c
View File

@@ -410,7 +410,7 @@ static int included_patches[] = {
// 717, // 717,
// 716, // 716,
// 715, // 715,
// 714, 714,
713, 713,
712, 712,
711, 711,