feedc0de/qmsgpack
1
0
Fork 0
forked from romixlab/qmsgpack
Code Pull Requests Activity

Fix unpack for uint values 127 < x < 65536

Browse Source
This commit is contained in:
Manuel Weichselbaumer
2020-04-09 13:01:53 +02:00
parent 7e1ca5b414
commit 8cdf333e5b
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/private/unpack_p.cpp
View File

@ -130,14 +130,14 @@ quint8 * MsgPackPrivate::unpack_negative_fixint(QVariant &v, quint8 *p)
quint8 * MsgPackPrivate::unpack_uint8(QVariant &v, quint8 *p) quint8 * MsgPackPrivate::unpack_uint8(QVariant &v, quint8 *p)
{ {
v = static_cast<quint8>(*(++p)); v = static_cast<quint32>(*(++p));
return p + 1; return p + 1;
} }
quint8 * MsgPackPrivate::unpack_uint16(QVariant &v, quint8 *p) quint8 * MsgPackPrivate::unpack_uint16(QVariant &v, quint8 *p)
{ {
p++; p++;
v = _msgpack_load16(quint16, p); v = static_cast<quint32>(_msgpack_load16(quint16, p));
return p + 2; return p + 2;
} }

14
tests/mixed/mixed_test.cpp
View File

@ -10,6 +10,7 @@ class MixedTest : public QObject
Q_OBJECT Q_OBJECT
private Q_SLOTS: private Q_SLOTS:
void test_uint();
void test_float(); void test_float();
void test_double(); void test_double();
void test_map(); void test_map();
@ -17,6 +18,19 @@ private Q_SLOTS:
void test_mixed(); void test_mixed();
}; };
void MixedTest::test_uint()
{
for (int i = 0; i <= 32; ++i) {
const quint32 u = (0x1UL<<i) - 1;
QByteArray packed = MsgPack::pack(u);
QVariant unpacked = MsgPack::unpack(packed);
QVERIFY2(unpacked.type() == QVariant::Type::UInt,
qPrintable(QString("Unpack failed for value %1. Type is %2").arg(u).arg(unpacked.type())));
QVERIFY2(unpacked.toUInt() == u,
qPrintable(QString("Unpack failed for value %1. Type is %2").arg(u).arg(unpacked.type())));
}
}
void MixedTest::test_float() void MixedTest::test_float()
{ {
float f; float f;