root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2025-01-18 12:02:10 +01:00
Code Issues Projects Releases Wiki Activity

Fixed LEB128 decoding + types

Browse Source
This commit is contained in:
Martin Tůma 2025-01-06 22:42:29 +01:00
parent 14069640b4
commit 252ca8542a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/data.cpp
View File

@ -15,7 +15,7 @@ struct CTX
const char *bp; const char *bp;
const char *be; const char *be;
quint64 tag; quint32 tag;
}; };
static inline qint64 zigzag64decode(quint64 value) static inline qint64 zigzag64decode(quint64 value)
@ -29,9 +29,8 @@ static bool varint(CTX &ctx, T &val)
{ {
val = 0; val = 0;
uint shift = 0; uint shift = 0;
const char *end = qMin(ctx.be, ctx.bp + sizeof(val));
while (ctx.bp < end) { while (ctx.bp < ctx.be) {
val |= ((quint8)*ctx.bp & 0x7F) << shift; val |= ((quint8)*ctx.bp & 0x7F) << shift;
shift += 7; shift += 7;
if (!((quint8)*ctx.bp++ & 0x80)) if (!((quint8)*ctx.bp++ & 0x80))
@ -43,7 +42,7 @@ static bool varint(CTX &ctx, T &val)
static bool str(CTX &ctx, QByteArray &val) static bool str(CTX &ctx, QByteArray &val)
{ {
quint64 len; qint32 len;
if (TYPE(ctx.tag) != LEN) if (TYPE(ctx.tag) != LEN)
return false; return false;
@ -89,7 +88,7 @@ static bool packed(CTX &ctx, QVector<quint32> &vals)
quint32 v; quint32 v;
if (TYPE(ctx.tag) == LEN) { if (TYPE(ctx.tag) == LEN) {
quint64 len; qint32 len;
if (!varint(ctx, len)) if (!varint(ctx, len))
return false; return false;
const char *ee = ctx.bp + len; const char *ee = ctx.bp + len;
@ -112,7 +111,7 @@ static bool packed(CTX &ctx, QVector<quint32> &vals)
static bool skip(CTX &ctx) static bool skip(CTX &ctx)
{ {
quint64 len = 0; qint32 len = 0;
switch (TYPE(ctx.tag)) { switch (TYPE(ctx.tag)) {
case VARINT: case VARINT:
@ -143,8 +142,9 @@ static bool value(CTX &ctx, QVariant &val)
if (TYPE(ctx.tag) != LEN) if (TYPE(ctx.tag) != LEN)
return false; return false;
qint32 len;
QByteArray ba; QByteArray ba;
quint64 len, num; quint64 num;
double dnum; double dnum;
float fnum; float fnum;
@ -214,11 +214,12 @@ static bool value(CTX &ctx, QVariant &val)
static bool feature(CTX &ctx, Data::Feature &f) static bool feature(CTX &ctx, Data::Feature &f)
{ {
quint32 e;
if (TYPE(ctx.tag) != LEN) if (TYPE(ctx.tag) != LEN)
return false; return false;
quint64 len; qint32 len;
quint8 e;
if (!varint(ctx, len)) if (!varint(ctx, len))
return false; return false;
@ -269,7 +270,7 @@ static bool layer(CTX &ctx, Data::Layer &l)
if (TYPE(ctx.tag) != LEN) if (TYPE(ctx.tag) != LEN)
return false; return false;
quint64 len; qint32 len;
if (!varint(ctx, len)) if (!varint(ctx, len))
return false; return false;