summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpommicket <pommicket@gmail.com>2022-12-20 12:28:14 -0500
committerpommicket <pommicket@gmail.com>2022-12-20 12:28:14 -0500
commit6b88ac48b9731771f85df727754a3bab998d7d2b (patch)
tree718bd54bbb7f04127868a564e55ac95a7fe37f04
parentcaf81c5a2c8b9432792c652edd0dcf1f64f7a4f1 (diff)
parent927f3eba4140be1526d51af9ecfc88b72b57dee2 (diff)
Merge branch 'trunk' into lsp
-rw-r--r--buffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/buffer.c b/buffer.c
index 0cd5d29..619842b 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1394,7 +1394,8 @@ BufferPos buffer_insert_text_at_pos(TextBuffer *buffer, BufferPos pos, String32
// create a copy of str. we need to do this to remove carriage returns and newlines in the case of line buffers
char32_t str_copy[256];
- if (str.len > arr_count(str_copy)) {
+ bool str_is_allocated = str.len > arr_count(str_copy);
+ if (str_is_allocated) {
char32_t *new_str = buffer_calloc(buffer, str.len, sizeof *new_str);
memcpy(new_str, str.str, str.len * sizeof *str.str);
str.str = new_str;
@@ -1494,9 +1495,8 @@ BufferPos buffer_insert_text_at_pos(TextBuffer *buffer, BufferPos pos, String32
buffer_lines_modified(buffer, pos.line, line_idx);
BufferPos b = {.line = line_idx, .index = index};
- if (str.len > arr_count(str_copy)) {
+ if (str_is_allocated)
free(str.str);
- }
return b;
}