From: Gunnar Beutner <gunnar@beutner.name>
Date: Fri, 16 Jan 2015 09:07:11 +0000 (+0100)
Subject: Fix incorrect source line info in the CLI console
X-Git-Tag: v2.3.0~369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e96d48e87ddb568b863d19177f27aa61a4aa524;p=icinga2

Fix incorrect source line info in the CLI console

fixes #8240
---

diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
index a94c14e9a..fd134bb88 100644
--- a/lib/cli/consolecommand.cpp
+++ b/lib/cli/consolecommand.cpp
@@ -109,9 +109,13 @@ int ConsoleCommand::Run(const po::variables_map& vm, const std::vector<std::stri
 			} catch (const ScriptError& ex) {
 				DebugInfo di = ex.GetDebugInfo();
 
-				std::cout << di.Path << ": " << lines[di.Path] << "\n";
-				std::cout << String(di.Path.GetLength() + 2, ' ');
-				std::cout << String(di.FirstColumn, ' ') << String(di.LastColumn - di.FirstColumn + 1, '^') << "\n";
+				if (lines.find(di.Path) != lines.end()) {
+					std::cout << di.Path << ": " << lines[di.Path] << "\n";
+					std::cout << String(di.Path.GetLength() + 2, ' ');
+					std::cout << String(di.FirstColumn, ' ') << String(di.LastColumn - di.FirstColumn + 1, '^') << "\n";
+				} else {
+					ShowCodeFragment(std::cout, di);
+				}
 
 				std::cout << ex.what() << "\n";
 			} catch (const std::exception& ex) {