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

Don't make invalid assumptions about memcmp()

Browse Source 
In qtranslator.cpp match()

Task-number: QTBUG-39757
Change-Id: I49e3ccc0ce900564bbe14609bfda47688382d5f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Albert Astals Cid 2014-11-26 23:12:01 +01:00
parent 1edc7554de
commit 247607a1af
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,13 +86,13 @@ static const uchar magic[MagicLength] = {
0xcd, 0x21, 0x1c, 0xbf, 0x60, 0xa1, 0xbd, 0xdd 0xcd, 0x21, 0x1c, 0xbf, 0x60, 0xa1, 0xbd, 0xdd
}; };
static bool match(const uchar* found, const char* target, uint len) static bool match(const uchar *found, uint foundLen, const char *target, uint targetLen)
{ {
// catch the case if \a found has a zero-terminating symbol and \a len includes it. // catch the case if \a found has a zero-terminating symbol and \a len includes it.
// (normalize it to be without the zero-terminating symbol) // (normalize it to be without the zero-terminating symbol)
if (len > 0 && found[len-1] == '\0') if (foundLen > 0 && found[foundLen-1] == '\0')
--len; --foundLen;
return (memcmp(found, target, len) == 0 && target[len] == '\0'); return ((targetLen == foundLen) && memcmp(found, target, foundLen) == 0);
} }
static void elfHash_continue(const char *name, uint &h) static void elfHash_continue(const char *name, uint &h)
@ -877,6 +877,9 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context,
{ {
const uchar *tn = 0; const uchar *tn = 0;
uint tn_length = 0; uint tn_length = 0;
const uint sourceTextLen = strlen(sourceText);
const uint contextLen = strlen(context);
const uint commentLen = strlen(comment);
for (;;) { for (;;) {
uchar tag = 0; uchar tag = 0;
@ -903,7 +906,7 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context,
case Tag_SourceText: { case Tag_SourceText: {
quint32 len = read32(m); quint32 len = read32(m);
m += 4; m += 4;
if (!match(m, sourceText, len)) if (!match(m, len, sourceText, sourceTextLen))
return QString(); return QString();
m += len; m += len;
} }
@ -911,7 +914,7 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context,
case Tag_Context: { case Tag_Context: {
quint32 len = read32(m); quint32 len = read32(m);
m += 4; m += 4;
if (!match(m, context, len)) if (!match(m, len, context, contextLen))
return QString(); return QString();
m += len; m += len;
} }
@ -919,7 +922,7 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context,
case Tag_Comment: { case Tag_Comment: {
quint32 len = read32(m); quint32 len = read32(m);
m += 4; m += 4;
if (*m && !match(m, comment, len)) if (*m && !match(m, len, comment, commentLen))
return QString(); return QString();
m += len; m += len;
} }
@ -969,11 +972,12 @@ QString QTranslatorPrivate::do_translate(const char *context, const char *source
return QString(); return QString();
c = contextArray + (2 + (hTableSize << 1) + (off << 1)); c = contextArray + (2 + (hTableSize << 1) + (off << 1));
const int contextLen = strlen(context);
for (;;) { for (;;) {
quint8 len = read8(c++); quint8 len = read8(c++);
if (len == 0) if (len == 0)
return QString(); return QString();
if (match(c, context, len)) if (match(c, len, context, contextLen))
break; break;
c += len; c += len;
} }