IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23099 from zeertzjq/vim-8.2.1014

Browse Source 
vim-patch:8.2.{1014,3329}
This commit is contained in:
zeertzjq 2023-04-15 14:57:14 +08:00 committed by GitHub
commit 0a61cb60a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/nvim/eval.c
View File

@ -3896,26 +3896,26 @@ static int eval_string(char **arg, typval_T *rettv, int evaluate)
// Copy the string into allocated memory, handling backslashed // Copy the string into allocated memory, handling backslashed
// characters. // characters.
const int len = (int)(p - *arg + extra);
char *name = xmalloc((size_t)len);
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = name; const int len = (int)(p - *arg + extra);
rettv->vval.v_string = xmalloc((size_t)len);
char *end = rettv->vval.v_string;
for (p = *arg + 1; *p != NUL && *p != '"';) { for (p = *arg + 1; *p != NUL && *p != '"';) {
if (*p == '\\') { if (*p == '\\') {
switch (*++p) { switch (*++p) {
case 'b': case 'b':
*name++ = BS; ++p; break; *end++ = BS; ++p; break;
case 'e': case 'e':
*name++ = ESC; ++p; break; *end++ = ESC; ++p; break;
case 'f': case 'f':
*name++ = FF; ++p; break; *end++ = FF; ++p; break;
case 'n': case 'n':
*name++ = NL; ++p; break; *end++ = NL; ++p; break;
case 'r': case 'r':
*name++ = CAR; ++p; break; *end++ = CAR; ++p; break;
case 't': case 't':
*name++ = TAB; ++p; break; *end++ = TAB; ++p; break;
case 'X': // hex: "\x1", "\x12" case 'X': // hex: "\x1", "\x12"
case 'x': case 'x':
@ -3941,9 +3941,9 @@ static int eval_string(char **arg, typval_T *rettv, int evaluate)
// For "\u" store the number according to // For "\u" store the number according to
// 'encoding'. // 'encoding'.
if (c != 'X') { if (c != 'X') {
name += utf_char2bytes(nr, name); end += utf_char2bytes(nr, end);
} else { } else {
*name++ = (char)nr; *end++ = (char)nr;
} }
} }
break; break;
@ -3957,14 +3957,14 @@ static int eval_string(char **arg, typval_T *rettv, int evaluate)
case '5': case '5':
case '6': case '6':
case '7': case '7':
*name = (char)(*p++ - '0'); *end = (char)(*p++ - '0');
if (*p >= '0' && *p <= '7') { if (*p >= '0' && *p <= '7') {
*name = (char)((*name << 3) + *p++ - '0'); *end = (char)((*end << 3) + *p++ - '0');
if (*p >= '0' && *p <= '7') { if (*p >= '0' && *p <= '7') {
*name = (char)((*name << 3) + *p++ - '0'); *end = (char)((*end << 3) + *p++ - '0');
} }
} }
name++; end++;
break; break;
// Special key, e.g.: "\<C-W>" // Special key, e.g.: "\<C-W>"
@ -3974,10 +3974,10 @@ static int eval_string(char **arg, typval_T *rettv, int evaluate)
if (p[1] != '*') { if (p[1] != '*') {
flags |= FSK_SIMPLIFY; flags |= FSK_SIMPLIFY;
} }
extra = trans_special((const char **)&p, strlen(p), name, flags, false, NULL); extra = trans_special((const char **)&p, strlen(p), end, flags, false, NULL);
if (extra != 0) { if (extra != 0) {
name += extra; end += extra;
if (name >= rettv->vval.v_string + len) { if (end >= rettv->vval.v_string + len) {
iemsg("eval_string() used more space than allocated"); iemsg("eval_string() used more space than allocated");
} }
break; break;
@ -3986,14 +3986,14 @@ static int eval_string(char **arg, typval_T *rettv, int evaluate)
FALLTHROUGH; FALLTHROUGH;
default: default:
mb_copy_char((const char **)&p, &name); mb_copy_char((const char **)&p, &end);
break; break;
} }
} else { } else {
mb_copy_char((const char **)&p, &name); mb_copy_char((const char **)&p, &end);
} }
} }
*name = NUL; *end = NUL;
if (*p != NUL) { // just in case if (*p != NUL) { // just in case
p++; p++;
} }
@ -4918,6 +4918,7 @@ static int eval_env_var(char **arg, typval_T *rettv, int evaluate)
name[len] = (char)cc; name[len] = (char)cc;
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = string; rettv->vval.v_string = string;
rettv->v_lock = VAR_UNLOCKED;
} }
return OK; return OK;