add safe check for load_text.

diff --git a/src/storage/phrase_large_table.cpp b/src/storage/phrase_large_table.cpp
index d8810d3..b115ceb 100644 (file)
--- a/src/storage/phrase_large_table.cpp
+++ b/src/storage/phrase_large_table.cpp
@@ -318,12 +318,15 @@ bool PhraseLargeTable::load_text(FILE * infile){
     phrase_token_t token;
     size_t freq;
 
-    while ( !feof(infile) ){
+    while ( !feof(infile) ) {
         fscanf(infile, "%s", pinyin);
         fscanf(infile, "%s", phrase);
         fscanf(infile, "%ld", &token);
         fscanf(infile, "%ld", &freq);
 
+        if ( feof(infile) )
+            break;
+
         glong phrase_len = g_utf8_strlen(phrase, -1);
         utf16_t * new_phrase = g_utf8_to_utf16(phrase, -1, NULL, NULL, NULL);
         add_index(phrase_len, new_phrase, token);

diff --git a/src/storage/pinyin_large_table.cpp b/src/storage/pinyin_large_table.cpp
index 07f643e..a5ed998 100644 (file)
--- a/src/storage/pinyin_large_table.cpp
+++ b/src/storage/pinyin_large_table.cpp
@@ -483,11 +483,14 @@ bool PinyinLargeTable::load_text(FILE * infile){
     phrase_token_t token;
     size_t freq;    
 
-    while ( !feof(infile)){
+    while ( !feof(infile) ) {
         fscanf(infile, "%s", pinyin);
         fscanf(infile, "%s", phrase);
         fscanf(infile, "%ld", &token);
        fscanf(infile, "%ld", &freq);   
+
+        if ( feof(infile) )
+            break;
        
        PinyinDefaultParser parser;
        NullPinyinValidator validator;