Exception handling improvements

FarGroup · Jan 13, 2025 · d380012 · d380012
1 parent e2a282d
commit d380012
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2025-01-13 22:03:15+00:00 - build 6414
+
+1. Exception handling improvements.
+
 --------------------------------------------------------------------------------
 MZK 2025-01-12 18:20:23-05:00 - build 6413
 

diff --git a/far/exception_handler.cpp b/far/exception_handler.cpp
@@ -1428,7 +1428,7 @@ static string exception_details(string_view const Module, EXCEPTION_RECORD const
 				string SymbolName;
 				tracer.get_symbols(Module, {{{ ExceptionRecord.ExceptionInformation[1], 0 }}}, [&](string&& Line)
 				{
-					SymbolName = std::move(Line);
+					SymbolName = trim_left(std::move(Line));
 				});
 
 				if (SymbolName.empty())
@@ -1437,7 +1437,7 @@ static string exception_details(string_view const Module, EXCEPTION_RECORD const
 				return SymbolName;
 			}();
 
-			auto Result = far::format(L"Memory at {} could not be {}"sv, Symbol, Mode);
+			auto Result = far::format(L"Memory at [{}] could not be {}"sv, Symbol, Mode);
 			if (NtStatus == EXCEPTION_IN_PAGE_ERROR && ExceptionRecord.NumberParameters >= 3)
 				append(Result, L": "sv, os::format_ntstatus(static_cast<NTSTATUS>(ExceptionRecord.ExceptionInformation[2])));
 
@@ -1570,10 +1570,8 @@ static string collect_information(
 	string Address, Name, Source;
 	tracer.get_symbol(ModuleName, Context.exception_record().ExceptionAddress, Address, Name, Source);
 
-	Address.insert(0, L"0x"sv);
-
 	if (!Name.empty())
-		append(Address, L" - "sv, Name);
+		append(Address, L' ', Name);
 
 	if (!Source.empty())
 		append(Address, L" ("sv, Source, L')');

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6413
+6414