X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInfo.cpp;h=2c3943effdb643f1a62aad49c19257553070885b;hb=f5123ccfa82215030c70561af881175d92244492;hp=a15270fa3a6acf585a72cdaa22fa5860493ebcb8;hpb=6ec5776991c34bdc97bf758abe479073c2bf252a;p=lyx.git

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index a15270fa3a..2c3943effd 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -309,10 +309,26 @@ void InsetInfo::updateInfo()
 	}
 	case LYXRC_INFO: {
 		ostringstream oss;
+		if (name_.empty()) {
+			setText(_("undefined"));
+			break;
+		}
 		lyxrc.write(oss, true, name_);
 		string result = oss.str();
-		// remove leading \\name
-		result = result.substr(name_.size() + 2);
+		if (result.size() < 2) {
+			setText(_("undefined"));
+			break;
+		}
+		string::size_type loc = result.rfind("\n", result.size() - 2);
+		loc = loc == string::npos ? 0 : loc + 1;
+		if (result.size() < loc + name_.size() + 1
+			  || result.substr(loc + 1, name_.size()) != name_) {
+			setText(_("undefined"));
+			break;
+		}
+		// remove leading comments and \\name and space
+		result = result.substr(loc + name_.size() + 2);
+		
 		// remove \n and ""
 		result = rtrim(result, "\n");
 		result = trim(result, "\"");
@@ -422,7 +438,7 @@ void InsetInfo::updateInfo()
 			itype = LyXVC::Date;
 		string binfo = buffer().lyxvc().revisionInfo(itype);
 		if (binfo.empty())
-			setText(bformat(_("[[%1$s unknown]]"), from_utf8(name_)));
+			setText(bformat(_("%1$s unknown"), from_ascii(name_)));
 		else
 			setText(from_utf8(binfo));
 		break;