[Bf-blender-cvs] [23e3dbb] master: Selection: avoid uninitialized memory read with occlusion queries

[Antony Riakiotakis]

Commit: 23e3dbb726beb5d551cda3d59833ab10474d5f63
Author: Antony Riakiotakis
Date:   Mon Feb 2 17:45:07 2015 +0100
Branches: master
https://developer.blender.org/rB23e3dbb726beb5d551cda3d59833ab10474d5f63

Selection: avoid uninitialized memory read with occlusion queries

===================================================================

M	source/blender/gpu/intern/gpu_select.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c
index 0515334..5172142 100644
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/source/blender/gpu/intern/gpu_select.c
@@ -158,7 +158,7 @@ bool GPU_select_load_id(unsigned int id)
 		g_query_state.active_query++;
 		g_query_state.query_issued = true;
 
-		if (g_query_state.mode == GPU_SELECT_NEAREST_SECOND_PASS) {
+		if (g_query_state.mode == GPU_SELECT_NEAREST_SECOND_PASS && g_query_state.index < g_query_state.oldhits) {
 			if (g_query_state.buffer[g_query_state.index * 4 + 3] == id) {
 				g_query_state.index++;
 				return true;