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

Fixed broken strings handling under Qt5

Browse Source
This commit is contained in:
Martin Tůma 2025-02-13 23:34:36 +01:00
parent dc1655a2d7
commit c9f7531f17
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data.cpp
View File

@ -60,7 +60,14 @@ static bool str(CTX &ctx, QByteArray &val)
if (ctx.bp + len > ctx.be) if (ctx.bp + len > ctx.be)
return false; return false;
/* In Qt5 the (later) conversion to QString is broken when the QByteArray is
not nul terminated so we have to use the "deep copy" constructor that
nul-terminates the byte array when it is created. */
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
val = QByteArray(ctx.bp, len);
#else
val = QByteArray::fromRawData(ctx.bp, len); val = QByteArray::fromRawData(ctx.bp, len);
#endif
ctx.bp += len; ctx.bp += len;
return true; return true;