diff options
| author | Ian Romanick <[email protected]> | 2012-07-27 15:49:50 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-29 15:09:35 -0700 |
| commit | 9555d7bdc1cec4cf08be85a2d1e9095de8dd3771 (patch) | |
| tree | 346a807b40063ee8c1c59c46be5f7f75e7d8f1ac /src/mesa/main | |
| parent | d6c8913bc629fedc520353cd9de51f1c7ba262a4 (diff) | |
mesa/es: Validate glGetPointerv pname in Mesa code rather than the ES wrapper
v2: Add proper core-profile, GLES1, and GLES3 filtering.
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/APIspec.xml | 10 | ||||
| -rw-r--r-- | src/mesa/main/getstring.c | 35 |
2 files changed, 33 insertions, 12 deletions
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml index cf4e5f85929..6d6462ca49b 100644 --- a/src/mesa/main/APIspec.xml +++ b/src/mesa/main/APIspec.xml @@ -923,16 +923,6 @@ <param name="pname" type="GLenum"/> <vector name="params" type="GLvoid **" size="dynamic"/> </proto> - - <desc name="pname"> - <value name="GL_VERTEX_ARRAY_POINTER"/> - <value name="GL_NORMAL_ARRAY_POINTER"/> - <value name="GL_COLOR_ARRAY_POINTER"/> - <value name="GL_TEXTURE_COORD_ARRAY_POINTER"/> - <value name="GL_MATRIX_INDEX_ARRAY_POINTER_OES" category="OES_matrix_palette"/> - <value name="GL_WEIGHT_ARRAY_POINTER_OES" category="OES_matrix_palette"/> - <value name="GL_POINT_SIZE_ARRAY_POINTER_OES" category="OES_point_size_array"/> - </desc> </template> <template name="Normal"> diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index c99486a4bb3..748a9435746 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -208,50 +208,81 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params ) switch (pname) { case GL_VERTEX_ARRAY_POINTER: + if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POS].Ptr; break; case GL_NORMAL_ARRAY_POINTER: + if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_NORMAL].Ptr; break; case GL_COLOR_ARRAY_POINTER: + if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR0].Ptr; break; case GL_SECONDARY_COLOR_ARRAY_POINTER_EXT: + if (ctx->API != API_OPENGL) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR1].Ptr; break; case GL_FOG_COORDINATE_ARRAY_POINTER_EXT: + if (ctx->API != API_OPENGL) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_FOG].Ptr; break; case GL_INDEX_ARRAY_POINTER: + if (ctx->API != API_OPENGL) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Ptr; break; case GL_TEXTURE_COORD_ARRAY_POINTER: + if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_TEX(clientUnit)].Ptr; break; case GL_EDGE_FLAG_ARRAY_POINTER: + if (ctx->API != API_OPENGL) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Ptr; break; case GL_FEEDBACK_BUFFER_POINTER: + if (ctx->API != API_OPENGL) + goto invalid_pname; *params = ctx->Feedback.Buffer; break; case GL_SELECTION_BUFFER_POINTER: + if (ctx->API != API_OPENGL) + goto invalid_pname; *params = ctx->Select.Buffer; break; #if FEATURE_point_size_array case GL_POINT_SIZE_ARRAY_POINTER_OES: + if (ctx->API != API_OPENGLES) + goto invalid_pname; *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Ptr; break; #endif case GL_DEBUG_CALLBACK_FUNCTION_ARB: + if (!_mesa_is_desktop_gl(ctx)) + goto invalid_pname; *params = (GLvoid *) ctx->Debug.Callback; break; case GL_DEBUG_CALLBACK_USER_PARAM_ARB: + if (!_mesa_is_desktop_gl(ctx)) + goto invalid_pname; *params = ctx->Debug.CallbackData; break; default: - _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" ); - return; + goto invalid_pname; } + + return; + +invalid_pname: + _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" ); + return; } |