1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QCryptographicHash: Extract Method finalize() from resultView()

Browse Source 
This brings the code in line with the sibling code in
QMessageAuthenticationCode, which now has a simiar split between
finalize() and finalizeUnchecked().

Pick-to: 6.5
Change-Id: I10701d59d56617ab32fae0df47371f0464e9cc77
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-02-21 11:17:50 +01:00
parent 303caa40da
commit a77e9d671d
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/corelib/tools/qcryptographichash.cpp
View File

@ -217,8 +217,9 @@ public:
void reset() noexcept; void reset() noexcept;
void addData(QByteArrayView bytes) noexcept; void addData(QByteArrayView bytes) noexcept;
void finalize() noexcept;
// when not called from the static hash() function, this function needs to be // when not called from the static hash() function, this function needs to be
// called with finalizeMutex held: // called with finalizeMutex held (finalize() will do that):
void finalizeUnchecked() noexcept; void finalizeUnchecked() noexcept;
// END functions that need to be called with finalizeMutex held // END functions that need to be called with finalizeMutex held
QByteArrayView resultView() const noexcept { return result.toByteArrayView(); } QByteArrayView resultView() const noexcept { return result.toByteArrayView(); }
@ -728,16 +729,25 @@ QByteArray QCryptographicHash::result() const
QByteArrayView QCryptographicHash::resultView() const noexcept QByteArrayView QCryptographicHash::resultView() const noexcept
{ {
// resultView() is a const function, so concurrent calls are allowed; protect: // resultView() is a const function, so concurrent calls are allowed; protect:
{ d->finalize();
const auto lock = qt_scoped_lock(d->finalizeMutex); // resultView() remains(!) valid even after we dropped the mutex in finalize()
// check that no other thread already finalizeUnchecked()'ed before us:
if (d->result.isEmpty())
d->finalizeUnchecked();
}
// resultView() remains(!) valid even after we dropped the mutex
return d->resultView(); return d->resultView();
} }
/*!
\internal
Calls finalizeUnchecked(), if needed, under finalizeMutex protection.
*/
void QCryptographicHashPrivate::finalize() noexcept
{
const auto lock = qt_scoped_lock(finalizeMutex);
// check that no other thread already finalizeUnchecked()'ed before us:
if (!result.isEmpty())
return;
finalizeUnchecked();
}
/*! /*!
\internal \internal