From eef60e5197768636e2d1e4fb5efc10989edfeb1b Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 24 Aug 2009 22:06:51 +0000
Subject: [PATCH] fix part of ticket #6142: avoid a memory access error when an
 encoding is unkonwn

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31222 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/tex2lyx/Parser.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index fdfcc38bc5..70ffb5eed5 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -154,7 +154,11 @@ Parser::~Parser()
 void Parser::setEncoding(std::string const & e)
 {
 	Encoding const * enc = encodings.fromLaTeXName(e);
-	//cerr << "setting encoding to " << enc->iconvName()<<std::endl;
+	if (!enc) {
+		cerr << "Unknown encoding " << e << ". Ignoring." << std::endl;
+		return;
+	}
+	//cerr << "setting encoding to " << enc->iconvName() << std::endl;
 	is_ << lyx::setEncoding(enc->iconvName());
 	encoding_latex_ = e;
 }
-- 
2.39.5