From afdb2acdecf4b563ed037f983b820ce82f6735ba Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Sat, 19 Jul 2025 18:28:39 +0300
Subject: fixed <EF> and <EW> with invalid buffer ids (was crashing)

* regression introduced in 2baa14add6d9976c29b27cf4470bb458a0198694
---
 src/error.h |  8 ++++++++
 src/ring.c  | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/error.h b/src/error.h
index 61bcce6..04bb988 100644
--- a/src/error.h
+++ b/src/error.h
@@ -47,6 +47,7 @@ typedef enum {
 	TECO_ERROR_WORDS,
 	TECO_ERROR_RANGE,
 	TECO_ERROR_SUBPATTERN,
+	TECO_ERROR_INVALIDBUF,
 	TECO_ERROR_INVALIDQREG,
 	TECO_ERROR_QREGOPUNSUPPORTED,
 	TECO_ERROR_QREGCONTAINSNULL,
@@ -125,6 +126,13 @@ teco_error_subpattern_set(GError **error, const gchar *cmd)
 	            "Invalid subpattern specified for <%s>", cmd);
 }
 
+static inline void
+teco_error_invalidbuf_set(GError **error, teco_int_t id)
+{
+	g_set_error(error, TECO_ERROR, TECO_ERROR_INVALIDBUF,
+	            "Invalid buffer id %" TECO_INT_FORMAT, id);
+}
+
 static inline void
 teco_error_invalidqreg_set(GError **error, const gchar *name, gsize len, gboolean local)
 {
diff --git a/src/ring.c b/src/ring.c
index 864512a..0576545 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -305,8 +305,7 @@ teco_ring_edit_by_id(teco_int_t id, GError **error)
 {
 	teco_buffer_t *buffer = teco_ring_find(id);
 	if (!buffer) {
-		g_set_error(error, TECO_ERROR, TECO_ERROR_FAILED,
-		            "Invalid buffer id %" TECO_INT_FORMAT, id);
+		teco_error_invalidbuf_set(error, id);
 		return FALSE;
 	}
 
@@ -557,6 +556,10 @@ teco_state_save_file_done(teco_machine_main_t *ctx, const teco_string_t *str, GE
 		if (!teco_expressions_pop_num_calc(&id, 0, error))
 			return NULL;
 		buffer = teco_ring_find(id);
+		if (!buffer) {
+			teco_error_invalidbuf_set(error, id);
+			return NULL;
+		}
 	} else if (teco_qreg_current) {
 		return !teco_qreg_current->vtable->save(teco_qreg_current, filename, error)
 		       ? NULL : &teco_state_start;
@@ -688,6 +691,10 @@ teco_state_ecommand_close(teco_machine_main_t *ctx, GError **error)
 		if (!teco_expressions_pop_num_calc(&id, 0, error))
 			return;
 		buffer = teco_ring_find(ABS(id));
+		if (!buffer) {
+			teco_error_invalidbuf_set(error, ABS(id));
+			return;
+		}
 		force = id < 0;
 	} else if (teco_qreg_current) {
 		/*
-- 
cgit v1.2.3