Merge pull request #3682 from lioncash/uam

gl_query_cache: Resolve use-after-move in CachedQuery move assignment operator
This commit is contained in:
bunnei 2020-04-17 01:24:08 -04:00 committed by GitHub
commit ca3af2961c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -94,9 +94,9 @@ CachedQuery::CachedQuery(CachedQuery&& rhs) noexcept
: VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {} : VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {}
CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept {
VideoCommon::CachedQueryBase<HostCounter>::operator=(std::move(rhs));
cache = rhs.cache; cache = rhs.cache;
type = rhs.type; type = rhs.type;
CachedQueryBase<HostCounter>::operator=(std::move(rhs));
return *this; return *this;
} }