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

Fix 32bit int overflow

Browse Source 
Do not continue if the conversion to 32bit int would cause an overflow.

Change-Id: I8a198dce5962e7ebd248b9baa92aba8730bfd3b0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2020-04-07 15:48:46 +02:00
parent 41387bb330
commit a1f9729b74
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/ssl/qasn1element.cpp
View File

@ -45,6 +45,7 @@
#include <QtCore/qvector.h>
#include <QDebug>
#include <limits>
#include <locale>
QT_BEGIN_NAMESPACE
@ -120,7 +121,7 @@ bool QAsn1Element::read(QDataStream &stream)
return false;
// length
qint64 length = 0;
quint64 length = 0;
quint8 first;
stream >> first;
if (first & 0x80) {
@ -139,11 +140,13 @@ bool QAsn1Element::read(QDataStream &stream)
length = (first & 0x7f);
}
if (length > quint64(std::numeric_limits<int>::max()))
return false;
// value
QByteArray tmpValue;
tmpValue.resize(length);
int count = stream.readRawData(tmpValue.data(), tmpValue.size());
if (count != length)
if (count != int(length))
return false;
mType = tmpType;