diff options
author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-01-18 17:01:21 +0300 |
---|---|---|
committer | Matthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr> | 2021-08-11 20:13:44 +0300 |
commit | 9ffa7bcd4d904ba927285e599b80e5d93d68f4d6 (patch) | |
tree | 7b2e90ccad7714638740a665f68dda7d98b51786 /src/common | |
parent | 3b99b11849ea8fa7108097c86764ff2046097206 (diff) |
Add workaround for issue discovered in https://github.com/owncloud/core/pull/38304
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/checksums.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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(); |