AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Verify presence of "magic cookie" before more expensive reads

Browse Source 
Moved this simple sanitation out of do_load as it will prevent us from
loading misplaced (or misfound) files into memory in the first place.

We'll still load anything minimally looking like a translation file.

Change-Id: Ia138be010979d4a66d330f7414fce3df20727e68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
João Abecasis 2012-03-28 15:10:52 +02:00 committed by Qt by Nokia
parent 4ef5a6269c
commit 26d12ecd27
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/kernel/qtranslator.cpp
View File

@ -454,12 +454,20 @@ bool QTranslatorPrivate::do_load(const QString &realname)
bool ok = false;
QFile file(realname);
if (!file.open(QIODevice::ReadOnly))
if (!file.open(QIODevice::ReadOnly | QIODevice::Unbuffered))
return false;
qint64 fileSize = file.size();
if (!fileSize || quint32(-1) <= fileSize)
if (fileSize <= MagicLength || quint32(-1) <= fileSize)
return false;
{
char magicBuffer[MagicLength];
if (MagicLength != file.read(magicBuffer, MagicLength)
|| memcmp(magicBuffer, magic, MagicLength))
return false;
}
d->unmapLength = quint32(fileSize);
#ifdef QT_USE_MMAP
@ -491,6 +499,7 @@ bool QTranslatorPrivate::do_load(const QString &realname)
if (!ok) {
d->unmapPointer = new char[d->unmapLength];
if (d->unmapPointer) {
file.seek(0);
qint64 readResult = file.read(d->unmapPointer, d->unmapLength);
if (readResult == qint64(unmapLength))
ok = true;
@ -670,6 +679,10 @@ bool QTranslator::load(const uchar *data, int len)
{
Q_D(QTranslator);
d->clear();
if (!data || len < MagicLength || memcmp(data, magic, MagicLength))
return false;
return d->do_load(data, len);
}
@ -690,9 +703,6 @@ static quint32 read32(const uchar *data)
bool QTranslatorPrivate::do_load(const uchar *data, int len)
{
if (!data || len < MagicLength || memcmp(data, magic, MagicLength))
return false;
bool ok = true;
const uchar *end = data + len;