diff options
| author | 2020-04-15 22:20:03 -0400 | |
|---|---|---|
| committer | 2020-04-15 22:20:06 -0400 | |
| commit | 3a60f19eaf71b9eead03a51a4af4beaebc75433f (patch) | |
| tree | 91a06d57c24dec6bda208f7e52eabeb8b3f74291 | |
| parent | Merge pull request #3612 from ReinUsesLisp/red (diff) | |
| download | yuzu-3a60f19eaf71b9eead03a51a4af4beaebc75433f.tar.gz yuzu-3a60f19eaf71b9eead03a51a4af4beaebc75433f.tar.xz yuzu-3a60f19eaf71b9eead03a51a4af4beaebc75433f.zip | |
gl_query_cache: Resolve use-after-move in CachedQuery move assignment operator
Avoids potential invalid junk data from being read.
| -rw-r--r-- | src/video_core/renderer_opengl/gl_query_cache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_query_cache.cpp b/src/video_core/renderer_opengl/gl_query_cache.cpp index f12e9f55f..d7ba57aca 100644 --- a/src/video_core/renderer_opengl/gl_query_cache.cpp +++ b/src/video_core/renderer_opengl/gl_query_cache.cpp | |||
| @@ -94,9 +94,9 @@ CachedQuery::CachedQuery(CachedQuery&& rhs) noexcept | |||
| 94 | : VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {} | 94 | : VideoCommon::CachedQueryBase<HostCounter>(std::move(rhs)), cache{rhs.cache}, type{rhs.type} {} |
| 95 | 95 | ||
| 96 | CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { | 96 | CachedQuery& CachedQuery::operator=(CachedQuery&& rhs) noexcept { |
| 97 | VideoCommon::CachedQueryBase<HostCounter>::operator=(std::move(rhs)); | ||
| 98 | cache = rhs.cache; | 97 | cache = rhs.cache; |
| 99 | type = rhs.type; | 98 | type = rhs.type; |
| 99 | CachedQueryBase<HostCounter>::operator=(std::move(rhs)); | ||
| 100 | return *this; | 100 | return *this; |
| 101 | } | 101 | } |
| 102 | 102 | ||