fix: dsl dictionary crash when skip expandOptionalParts as headword i…

…s too long
xiaoyifang · May 21, 2022 · 40f67d7 · 40f67d7
1 parent 2b9b278
commit 40f67d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/dsl.cc b/dsl.cc
@@ -2153,10 +2153,9 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           hasString = false;
 
-          // The line read should either consist of pure whitespace, or be a
-          // headword
-
-          if ( curString.empty() )
+          // The line read should either consist of pure whitespace, or be a headword
+          // skip too long headword,it can never be headword.
+          if( curString.empty() || curString.size() > 100 )
             continue;
 
           if ( isDslWs( curString[ 0 ] ) )

diff --git a/dsl_details.cc b/dsl_details.cc
@@ -1155,12 +1155,6 @@ void expandOptionalParts( wstring & str, list< wstring > * result,
   list< wstring > * headwords;
   headwords = inside_recurse ? result : &expanded;
 
-  //if str is too long ,it can never be headwords.
-  //todo?
-  if( str.size() > 100 )
-  {
-    return;
-  }
   for( ; x < str.size(); )
   {
     wchar ch = str[ x ];