diff options
Diffstat (limited to 'src/track/serato/markers2.cpp')
-rw-r--r-- | src/track/serato/markers2.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/track/serato/markers2.cpp b/src/track/serato/markers2.cpp index 550c1bc906..0f746a6574 100644 --- a/src/track/serato/markers2.cpp +++ b/src/track/serato/markers2.cpp @@ -26,7 +26,9 @@ QString zeroTerminatedUtf8StringtoQString(QDataStream* stream) { quint8 byte = '\xFF'; while (byte != '\x00') { *stream >> byte; - data.append(byte); + if (byte != '\x00') { + data.append(byte); + } if (stream->status() != QDataStream::Status::Ok) { return QString(); } @@ -537,7 +539,7 @@ QByteArray SeratoMarkers2::dumpCommon() const { QByteArray entryData = entry->dump(); stream.writeRawData(entryName.constData(), entryName.length()); stream << static_cast<quint8>('\x00') // terminating null-byte - << entryData.length(); + << static_cast<quint32>(entryData.length()); stream.writeRawData(entryData.constData(), entryData.length()); } data.append('\0'); @@ -767,7 +769,7 @@ QByteArray SeratoMarkers2::dumpBase64Encoded() const { QByteArray entryData = entry->dump(); stream.writeRawData(entryName.constData(), entryName.length()); stream << static_cast<quint8>(0x00) // terminating null-byte - << entryData.length(); + << static_cast<quint32>(entryData.length()); stream.writeRawData(entryData.constData(), entryData.length()); } innerData.append('\0'); |