From d8419ffca2feabae6f3069e1f2f6dc2f4c8da5c0 Mon Sep 17 00:00:00 2001
From: wnqqnw19 <adambrodigan91@gmail.com>
Date: Thu, 4 Dec 2025 10:27:18 -0800
Subject: [PATCH] triedb/pathdb: fix error handling in journal cleanup defer
 function

---
 triedb/pathdb/journal.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/triedb/pathdb/journal.go b/triedb/pathdb/journal.go
index 02bdef5d34..d43319f462 100644
--- a/triedb/pathdb/journal.go
+++ b/triedb/pathdb/journal.go
@@ -362,9 +362,14 @@ func (db *Database) Journal(root common.Hash) error {
 		}
 		defer func() {
 			if file != nil {
-				file.Close()
-				os.Remove(tmp) // Clean up temp file if we didn't successfully rename it
-				log.Warn("Removed leftover temporary journal file", "path", tmp)
+				if err := file.Close(); err != nil {
+					log.Warn("Failed to close temporary journal file", "path", tmp, "err", err)
+				}
+				if err := os.Remove(tmp); err != nil {
+					log.Warn("Failed to remove leftover temporary journal file", "path", tmp, "err", err)
+				} else {
+					log.Warn("Removed leftover temporary journal file", "path", tmp)
+				}
 			}
 		}()
 		journal = file