]> git.lyx.org Git - lyx.git/commitdiff
fix part of ticket #6142: avoid a memory access error when an encoding is unkonwn
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Mon, 24 Aug 2009 22:06:51 +0000 (22:06 +0000)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Mon, 24 Aug 2009 22:06:51 +0000 (22:06 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31222 a592a061-630c-0410-9148-cb99ea01b6c8

src/tex2lyx/Parser.cpp

index fdfcc38bc51b9b0980f0a789b68467e0dbd14560..70ffb5eed57b3020794dae6be2148823e350df7b 100644 (file)
@@ -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;
 }