From 702c94aacfdca34b71eadf753c21b3d92d886cf0 Mon Sep 17 00:00:00 2001
From: Nikolai Aleksandrovich Pavlov <kp-pav@yandex.ru>
Date: Sun, 9 Jul 2017 11:40:46 +0300
Subject: mbyte: Fix crash when using multibyte chars in maparg() return
 (#6986)

This is a refactoring typo from #6947.

Fixes #6985

Combined with #6947 where typo was made it also fixes vim/vim#1827 which was
present in Neovim.
---
 src/nvim/mbyte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 5b00a4b9a8..2acfb896d8 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -1780,7 +1780,7 @@ const char *mb_unescape(const char **const pp)
     // Return a multi-byte character if it's found.  An illegal sequence
     // will result in a 1 here.
     if (utf_ptr2len((const char_u *)buf) > 1) {
-      *pp = (const char *)str + buf_idx + 1;
+      *pp = (const char *)str + str_idx + 1;
       return buf;
     }
 
-- 
cgit