From d3c4b7e9461f90bad7a671c1221d65def9cccc89 Mon Sep 17 00:00:00 2001 From: John Marriott Date: Tue, 25 Feb 2025 20:56:38 +0100 Subject: [PATCH] patch 9.1.1151: too many strlen() calls in getchar.c Problem: too many strlen() calls in getchar.c Solution: store last inserted and recorded lengths, add functions to retrieve those and use those functions (John Marriott) closes: #16720 Signed-off-by: John Marriott Signed-off-by: Christian Brabandt --- src/edit.c | 8 ++++---- src/getchar.c | 45 +++++++++++++++++++++++++++++++++++-------- src/proto/getchar.pro | 2 ++ src/register.c | 9 +++------ src/version.c | 2 ++ 5 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/edit.c b/src/edit.c index a1224a2b17..6f22b43115 100644 --- a/src/edit.c +++ b/src/edit.c @@ -421,7 +421,7 @@ edit( new_insert_skip = 0; else { - new_insert_skip = (int)STRLEN(ptr); + new_insert_skip = (int)get_inserted_len(); vim_free(ptr); } @@ -2462,7 +2462,7 @@ stop_insert( * otherwise CTRL-O w and then will clear "last_insert". */ ptr = get_inserted(); - int added = ptr == NULL ? 0 : (int)STRLEN(ptr) - new_insert_skip; + int added = ptr == NULL ? 0 : (int)get_inserted_len() - new_insert_skip; if (did_restart_edit == 0 || added > 0) { vim_free(last_insert); @@ -2993,11 +2993,11 @@ get_last_insert_save(void) if (last_insert == NULL) return NULL; - s = vim_strsave(last_insert + last_insert_skip); + len = (int)STRLEN(last_insert + last_insert_skip); + s = vim_strnsave(last_insert + last_insert_skip, len); if (s == NULL) return NULL; - len = (int)STRLEN(s); if (len > 0 && s[len - 1] == ESC) // remove trailing ESC s[len - 1] = NUL; return s; diff --git a/src/getchar.c b/src/getchar.c index 83a9861ecb..3b4aad0576 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -88,6 +88,11 @@ static char_u noremapbuf_init[TYPELEN_INIT]; // initial typebuf.tb_noremap static size_t last_recorded_len = 0; // number of last recorded chars +static size_t last_get_recorded_len = 0; // length of the string returned from the + // last call to get_recorded() +static size_t last_get_inserted_len = 0; // length of the string returned from the + // last call to get_inserted() + #ifdef FEAT_EVAL mapblock_T *last_used_map = NULL; int last_used_sid = -1; @@ -168,31 +173,46 @@ get_buffcont( get_recorded(void) { char_u *p; - size_t len; - p = get_buffcont(&recordbuff, TRUE, &len); + p = get_buffcont(&recordbuff, TRUE, &last_get_recorded_len); + if (p == NULL) + return NULL; + free_buff(&recordbuff); /* * Remove the characters that were added the last time, these must be the * (possibly mapped) characters that stopped the recording. */ - if (len >= last_recorded_len) + if (last_get_recorded_len >= last_recorded_len) { - len -= last_recorded_len; - p[len] = NUL; + last_get_recorded_len -= last_recorded_len; + p[last_get_recorded_len] = NUL; } /* * When stopping recording from Insert mode with CTRL-O q, also remove the * CTRL-O. */ - if (len > 0 && restart_edit != 0 && p[len - 1] == Ctrl_O) - p[len - 1] = NUL; + if (last_get_recorded_len > 0 && restart_edit != 0 + && p[last_get_recorded_len - 1] == Ctrl_O) + { + --last_get_recorded_len; + p[last_get_recorded_len] = NUL; + } return (p); } +/* + * Return the length of string returned from the last call of get_recorded(). + */ + size_t +get_recorded_len(void) +{ + return last_get_recorded_len; +} + /* * Return the contents of the redo buffer as a single string. * K_SPECIAL and CSI in the returned string are escaped. @@ -200,7 +220,16 @@ get_recorded(void) char_u * get_inserted(void) { - return get_buffcont(&redobuff, FALSE, NULL); + return get_buffcont(&redobuff, FALSE, &last_get_inserted_len); +} + +/* + * Return the length of string returned from the last call of get_inserted(). + */ + size_t +get_inserted_len(void) +{ + return last_get_inserted_len; } /* diff --git a/src/proto/getchar.pro b/src/proto/getchar.pro index 1473879130..d1d78a223a 100644 --- a/src/proto/getchar.pro +++ b/src/proto/getchar.pro @@ -1,6 +1,8 @@ /* getchar.c */ char_u *get_recorded(void); +size_t get_recorded_len(void); char_u *get_inserted(void); +size_t get_inserted_len(void); int stuff_empty(void); int readbuf1_empty(void); void typeahead_noflush(int c); diff --git a/src/register.c b/src/register.c index ea54e202ef..384c4d54fc 100644 --- a/src/register.c +++ b/src/register.c @@ -28,7 +28,7 @@ static yankreg_T *y_current; // ptr to current yankreg static int y_append; // TRUE when appending static yankreg_T *y_previous = NULL; // ptr to last written yankreg -static int stuff_yank(int, char_u *); +static int stuff_yank(int, char_u *, size_t); static void put_reedit_in_typebuf(int silent); static int put_in_typebuf(char_u *s, int esc, int colon, int silent); static int yank_copy_line(struct block_def *bd, long y_idx, int exclude_trailing_space); @@ -419,7 +419,7 @@ do_record(int c) old_y_previous = y_previous; old_y_current = y_current; - retval = stuff_yank(regname, p); + retval = stuff_yank(regname, p, get_recorded_len()); y_previous = old_y_previous; y_current = old_y_current; @@ -435,10 +435,8 @@ do_record(int c) * return FAIL for failure, OK otherwise */ static int -stuff_yank(int regname, char_u *p) +stuff_yank(int regname, char_u *p, size_t plen) { - size_t plen; - // check for read-only register if (regname != 0 && !valid_yank_reg(regname, TRUE)) { @@ -451,7 +449,6 @@ stuff_yank(int regname, char_u *p) return OK; } - plen = STRLEN(p); get_yank_register(regname, TRUE); if (y_append && y_current->y_array != NULL) { diff --git a/src/version.c b/src/version.c index 6275311a12..3456be54a9 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1151, /**/ 1150, /**/