hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #1584 from xiaoyifang/fix/slob-truncate

Browse source 
fix: slob truncated file check.
This commit is contained in:
xiaoyifang 2024-06-14 23:02:23 +08:00 committed by GitHub
parent ac8c459e01 5712f63b8e
commit 4ac44e9a48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dict/slob.cc
View file

@ -58,6 +58,7 @@ using BtreeIndexing::IndexedWords;
using BtreeIndexing::IndexInfo; using BtreeIndexing::IndexInfo;
DEF_EX_STR( exNotSlobFile, "Not an Slob file", Dictionary::Ex ) DEF_EX_STR( exNotSlobFile, "Not an Slob file", Dictionary::Ex )
DEF_EX( exTruncateFile, "Slob file truncated", Dictionary::Ex )
using Dictionary::exCantReadFile; using Dictionary::exCantReadFile;
DEF_EX_STR( exCantDecodeFile, "Can't decode file", Dictionary::Ex ) DEF_EX_STR( exCantDecodeFile, "Can't decode file", Dictionary::Ex )
DEF_EX_STR( exNoCodecFound, "No text codec found", Dictionary::Ex ) DEF_EX_STR( exNoCodecFound, "No text codec found", Dictionary::Ex )
@ -323,8 +324,8 @@ void SlobFile::open( const QString & name )
encoding = readTinyText(); encoding = readTinyText();
codec = QTextCodec::codecForName( encoding.toLatin1() ); codec = QTextCodec::codecForName( encoding.toLatin1() );
if ( codec == 0 ) { if ( codec == nullptr ) {
error = QString( "for encoding \"" ) + encoding + "\""; error = QString( R"(for encoding "%1")" ).arg( encoding );
throw exNoCodecFound( string( error.toUtf8().data() ) ); throw exNoCodecFound( string( error.toUtf8().data() ) );
} }
@ -383,6 +384,11 @@ void SlobFile::open( const QString & name )
break; break;
fileSize = qFromBigEndian( tmp ); fileSize = qFromBigEndian( tmp );
//truncated file
if ( file.size() < fileSize ) {
throw exTruncateFile();
}
if ( file.read( (char *)&cnt, sizeof( cnt ) ) != sizeof( cnt ) ) if ( file.read( (char *)&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
break; break;
refsCount = qFromBigEndian( cnt ); refsCount = qFromBigEndian( cnt );
@ -672,13 +678,7 @@ SlobDictionary::SlobDictionary( string const & id, string const & indexFile, vec
idxHeader( idx.read< IdxHeader >() ) idxHeader( idx.read< IdxHeader >() )
{ {
// Open data file // Open data file
try {
sf.open( dictionaryFiles[ 0 ].c_str() ); sf.open( dictionaryFiles[ 0 ].c_str() );
}
catch ( std::exception & e ) {
gdWarning( "Slob dictionary initializing failed: %s, error: %s\n", dictionaryFiles[ 0 ].c_str(), e.what() );
}
// Initialize the indexes // Initialize the indexes