summaryrefslogtreecommitdiffstats
path: root/src/storage
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2010-09-01 17:04:38 +0800
committerPeng Wu <alexepico@gmail.com>2010-09-01 17:04:38 +0800
commitbee691f0e31f0b661f7c2c16230163dd7d526d4c (patch)
treef0a4e2be996a0c236426e33b0bf446be07eaae22 /src/storage
parentcdb3ae7a7bab2970eedae28ee7d1a387847f51fd (diff)
downloadlibpinyin-bee691f0e31f0b661f7c2c16230163dd7d526d4c.tar.gz
libpinyin-bee691f0e31f0b661f7c2c16230163dd7d526d4c.tar.xz
libpinyin-bee691f0e31f0b661f7c2c16230163dd7d526d4c.zip
add safe check for load_text.
Diffstat (limited to 'src/storage')
-rw-r--r--src/storage/phrase_large_table.cpp5
-rw-r--r--src/storage/pinyin_large_table.cpp5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/storage/phrase_large_table.cpp b/src/storage/phrase_large_table.cpp
index d8810d3..b115ceb 100644
--- 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
--- 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;