1 files changed, 4 insertions, 11 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 6fc08643af..fae8e9ecd0 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1,12 +1,4 @@
 /*
- * VIM - Vi IMproved	by Bram Moolenaar
- *
- * Do ":help uganda"  in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- * See README.txt for an overview of the Vim source code.
- */
-
-/*
  * buffer.c: functions for dealing with the buffer structure
  */
 
@@ -25,7 +17,6 @@
  */
 
 #include <stdbool.h>
-#include <errno.h>
 #include <string.h>
 #include <inttypes.h>
 
@@ -3754,8 +3745,10 @@ int build_stl_str_hl(
       // Put a `<` to mark where we truncated at
       *trunc_p = '<';
 
-      // Advance the pointer to the end of the string
-      trunc_p = trunc_p + STRLEN(trunc_p);
+      if (width + 1 < maxwidth) {
+        // Advance the pointer to the end of the string
+        trunc_p = trunc_p + STRLEN(trunc_p);
+      }
 
       // Fill up for half a double-wide character.
       while (++width < maxwidth) {