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

QCryptographicHash: move result.clear() to beginning of reset()

Browse Source 
... from the end().

It was lonely down there, and prone to be overlooked when performing
early returns in the #ifdef'ery above, as witnessed by the early
returns in the OpenSSL3 code.

Amends 1fe74c3bd3f727551b8168ee9f3e642d42233d55, itself amending
633c1365966eda89fc883c039683a727d0a0813e.

Change-Id: I8c941ecb5c4755d8823b2161544cf6f7fe75a239
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 9a18ca59ffc93b6e4b18a64c624ab396e3976f60)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-02-23 14:44:49 +01:00 committed by Qt Cherry-pick Bot
parent 6d971d01b3
commit d90ad97e8b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,6 +460,7 @@ QCryptographicHash::Algorithm QCryptographicHash::algorithm() const noexcept
void QCryptographicHashPrivate::reset() noexcept
{
result.clear();
#ifdef USING_OPENSSL30
if (method == QCryptographicHash::Blake2b_160 ||
method == QCryptographicHash::Blake2b_256 ||
@ -569,7 +570,6 @@ void QCryptographicHashPrivate::reset() noexcept
#endif
}
#endif // !QT_CONFIG(opensslv30)
result.clear();
}
#if QT_DEPRECATED_SINCE(6, 4)