From 94f8cf94e30eb2a5548b6689f5aed30fa38eda91 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 24 Jan 2018 11:42:30 +0000 Subject: [PATCH] Check iterator validity before dereferencing it --- renderdoc/driver/gl/gl_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index 57a77508a..06df4cd48 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -919,7 +919,7 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData) fetch.res.Context = winData.ctx; size_t before = m_QueuedInitialFetches.size(); auto it = std::lower_bound(m_QueuedInitialFetches.begin(), m_QueuedInitialFetches.end(), fetch); - for(; it->res.Context == winData.ctx && it != m_QueuedInitialFetches.end();) + for(; it != m_QueuedInitialFetches.end() && it->res.Context == winData.ctx;) { GetResourceManager()->ContextPrepare_InitialState(it->res); it = m_QueuedInitialFetches.erase(it);