From 62c728f7d84400c19681971855338e3e9e8e80da Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 23 May 2016 07:20:50 +1000
Subject: [PATCH] mesa/queryobject: return INVALID_VALUE if offset < 0 (v2)

This fixes:
GL45-CTS.direct_state_access.queries_errors

The ARB_direct_state_access spec agrees.

v2: move check down further (Ilia)

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 src/mesa/main/queryobj.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 7a70b592c47..1fa02795c1c 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -766,6 +766,11 @@ get_query_object(struct gl_context *ctx, const char *func,
          return;
       }
 
+      if (offset < 0) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset is negative)", func);
+         return;
+      }
+
       switch (pname) {
       case GL_QUERY_RESULT:
       case GL_QUERY_RESULT_NO_WAIT:
-- 
2.30.2