From 9ffa7bcd4d904ba927285e599b80e5d93d68f4d6 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Mon, 18 Jan 2021 15:01:21 +0100 Subject: Add workaround for issue discovered in https://github.com/owncloud/core/pull/38304 --- src/common/checksums.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/common') diff --git a/src/common/checksums.cpp b/src/common/checksums.cpp index bdf95b358..c6857e549 100644 --- a/src/common/checksums.cpp +++ b/src/common/checksums.cpp @@ -153,8 +153,13 @@ QByteArray findBestChecksum(const QByteArray &_checksums) || -1 != (i = checksums.indexOf(QLatin1String("MD5:"), 0, Qt::CaseInsensitive)) || -1 != (i = checksums.indexOf(QLatin1String("ADLER32:"), 0, Qt::CaseInsensitive))) { // Now i is the start of the best checksum - // Grab it until the next space or end of string. - return _checksums.mid(i, _checksums.indexOf(' ', i) - i); + // Grab it until the next space or end of xml or end of string. + int end = _checksums.indexOf(' ', i); + // workaround for https://github.com/owncloud/core/pull/38304 + if (end == -1) { + end = _checksums.indexOf('<', i); + } + return _checksums.mid(i, end - i); } qCWarning(lcChecksums) << "Failed to parse" << _checksums; return QByteArray(); -- cgit v1.2.3