Merge branch 'trunk' into lsp

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;
 }