From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 25 Jun 2012 09:04:56 +0000 (+0200)
Subject: Fix bug #8220: tex2lyx crashes on single-character commands
X-Git-Tag: 2.1.0beta1~1727
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a13b02a94fdcbb6a4a700801a5ea10e737f4655;p=features.git

Fix bug #8220: tex2lyx crashes on single-character commands

Fix commit [aa9fed93/lyxgit]: it is never a good idea to call substr(4) on a string without checking its length. Moreover, it is even better in this case to check that the first letters are "text" as the reminder of the code assumes...
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 50eee93a3d..c28e4366e6 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3573,7 +3573,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			                      context.font.language, lang);
 		}
 		
-		else if (is_known(t.cs().substr(4, string::npos), polyglossia_languages)) {
+		else if (prefixIs(t.cs(), "text") 
+			 && is_known(t.cs().substr(4), polyglossia_languages)) {
 			// scheme is \textLANGUAGE{text} where LANGUAGE is in polyglossia_languages[]
 			string lang;
 			// We have to output the whole command if it has an option