fix for-loop in _mesa_GetDouble to avoid out of bounds memory read

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index b6f08efc34dd76abdcc68f91602d1b8b1dadb5b8..fcc879576ce8f08213dfcf98010536ee21aeb0f9 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -5627,7 +5627,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 
    _mesa_GetFloatv(pname, values);
    
-   for (i = 0; values[i] != magic && i < 16; i++)
+   for (i = 0; i < 16 && values[i] != magic; i++)
       params[i] = (GLdouble) values[i];
 }
 

diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 8259972daa4a9af49da824fa4cb3497d94d21e87..9f1be8b9350ec7c84df66a57cfde5c304db3395a 100644 (file)
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1178,7 +1178,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
 
    _mesa_GetFloatv(pname, values);
    
-   for (i = 0; values[i] != magic && i < 16; i++)
+   for (i = 0; i < 16 && values[i] != magic; i++)
       params[i] = (GLdouble) values[i];
 }
 """