61 lines
2.4 KiB
Diff
61 lines
2.4 KiB
Diff
|
From 1a887293ef66b51220d40f8f91dfc8245f8aeec5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Lingelbach <m.j.lbach@gmail.com>
|
||
|
|
Date: Wed, 15 Dec 2021 09:07:23 -0800
|
||
|
|
Subject: [PATCH 1/2] fix: do not cast offset to char_u
|
||
|
|
|
||
|
|
* str_utf_start/end both cast the offset into the utf string
|
||
|
|
to a char_u, a pointer + long is well-defined and the cast is
|
||
|
|
unnecessary. This previously resulted in issues for offsets greater than
|
||
|
|
256.
|
||
|
|
---
|
||
|
|
src/nvim/lua/stdlib.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c
|
||
|
|
index b5553060a1dc..e7dba1239280 100644
|
||
|
|
--- a/src/nvim/lua/stdlib.c
|
||
|
|
+++ b/src/nvim/lua/stdlib.c
|
||
|
|
@@ -231,7 +231,7 @@ static int nlua_str_utf_start(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
|
||
|
|
if (offset < 0 || offset > (intptr_t)s1_len) {
|
||
|
|
return luaL_error(lstate, "index out of range");
|
||
|
|
}
|
||
|
|
- int tail_offset = mb_head_off((char_u *)s1, (char_u *)s1 + (char_u)offset - 1);
|
||
|
|
+ int tail_offset = mb_head_off((char_u *)s1, (char_u *)s1 + offset - 1);
|
||
|
|
lua_pushinteger(lstate, tail_offset);
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
@@ -251,7 +251,7 @@ static int nlua_str_utf_end(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
|
||
|
|
if (offset < 0 || offset > (intptr_t)s1_len) {
|
||
|
|
return luaL_error(lstate, "index out of range");
|
||
|
|
}
|
||
|
|
- int tail_offset = mb_tail_off((char_u *)s1, (char_u *)s1 + (char_u)offset - 1);
|
||
|
|
+ int tail_offset = mb_tail_off((char_u *)s1, (char_u *)s1 + offset - 1);
|
||
|
|
lua_pushinteger(lstate, tail_offset);
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
From fcbffcd92a2f53c224e2297c4807c14ac553bdbf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Lingelbach <m.j.lbach@gmail.com>
|
||
|
|
Date: Wed, 15 Dec 2021 09:07:23 -0800
|
||
|
|
Subject: [PATCH 2/2] chore: improve naming consistency in str_utf_start
|
||
|
|
|
||
|
|
---
|
||
|
|
src/nvim/lua/stdlib.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c
|
||
|
|
index e7dba1239280..c9f82a2df127 100644
|
||
|
|
--- a/src/nvim/lua/stdlib.c
|
||
|
|
+++ b/src/nvim/lua/stdlib.c
|
||
|
|
@@ -231,8 +231,8 @@ static int nlua_str_utf_start(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL
|
||
|
|
if (offset < 0 || offset > (intptr_t)s1_len) {
|
||
|
|
return luaL_error(lstate, "index out of range");
|
||
|
|
}
|
||
|
|
- int tail_offset = mb_head_off((char_u *)s1, (char_u *)s1 + offset - 1);
|
||
|
|
- lua_pushinteger(lstate, tail_offset);
|
||
|
|
+ int head_offset = mb_head_off((char_u *)s1, (char_u *)s1 + offset - 1);
|
||
|
|
+ lua_pushinteger(lstate, head_offset);
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|