diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-05-04 09:56:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-05-04 09:56:49 +0200 |
| commit | 069dd08d8dbbbadc4e6780d5c881a24bce79a4f7 (patch) | |
| tree | 6306d1906a7c58d4184adefc710f5ce2862ef291 | |
| parent | ea98f8b4d6d2d2843b803f4c105cff1fe6fa0a90 (diff) | |
| download | vim-069dd08d8dbbbadc4e6780d5c881a24bce79a4f7.zip | |
patch 7.4.714
Problem: Illegal memory access when there are illegal bytes.
Solution: Check the byte length of the character. (Dominique Pelle)
| -rw-r--r-- | src/regexp.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/regexp.c b/src/regexp.c index 6ae05f8f9..85e0458de 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -6113,7 +6113,7 @@ do_class: { if (ireg_ic && enc_utf8) cf = utf_fold(utf_ptr2char(opnd)); - while (count < maxcount) + while (count < maxcount && (*mb_ptr2len)(scan) >= len) { for (i = 0; i < len; ++i) if (opnd[i] != scan[i]) diff --git a/src/version.c b/src/version.c index 4097dac09..8f994cd79 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 714, +/**/ 713, /**/ 712, |