summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holthuis <jholthuis@mixxx.org>2022-01-15 12:14:58 +0100
committerJan Holthuis <jholthuis@mixxx.org>2022-01-15 12:38:01 +0100
commit481663c185b000f1121d35aaa40a359660dd6cfd (patch)
treef93d995cd0f92301ef8757bc04ca654a5edca492
parent35d104e1f67f32a1bcc40497e402c9dbfbbe16c2 (diff)
SeratoMarkers2: Always skip trailing null byte when parsing string
This should be done explicitly instead of depending on this behavior detail of QString::fromUtf8(), because it changes in Qt6.
-rw-r--r--src/track/serato/markers2.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/track/serato/markers2.cpp b/src/track/serato/markers2.cpp
index 07b4a62566..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();
}