fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: check for enabled extensions for *UID enums

Browse source 
Applications might use them without checking if the extension is supported
and would run into a NULL pointer deref calling the callbacks.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30455>
(cherry picked from commit 740cae64a1)
This commit is contained in:
Karol Herbst 2024-07-30 15:01:37 +02:00 • committed by Eric Engestrom
parent c86eba672a
commit 05f1c0b9ea
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5634,7 +5634,7 @@
"description": "mesa: check for enabled extensions for *UID enums",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

8
src/mesa/main/get.c
View file

@ -2908,20 +2908,28 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
/* GL_EXT_external_objects */
case GL_NUM_DEVICE_UUIDS_EXT:
if (!ctx->Extensions.EXT_memory_object && !ctx->Extensions.EXT_semaphore)
goto invalid_enum;
v->value_int = 1;
return TYPE_INT;
case GL_DRIVER_UUID_EXT:
if (!ctx->Extensions.EXT_memory_object && !ctx->Extensions.EXT_semaphore)
goto invalid_enum;
if (index >= 1)
goto invalid_value;
_mesa_get_driver_uuid(ctx, v->value_int_4);
return TYPE_INT_4;
case GL_DEVICE_UUID_EXT:
if (!ctx->Extensions.EXT_memory_object && !ctx->Extensions.EXT_semaphore)
goto invalid_enum;
if (index >= 1)
goto invalid_value;
_mesa_get_device_uuid(ctx, v->value_int_4);
return TYPE_INT_4;
/* GL_EXT_memory_object_win32 */
case GL_DEVICE_LUID_EXT:
if (!ctx->Extensions.EXT_memory_object_win32 && !ctx->Extensions.EXT_semaphore_win32)
goto invalid_enum;
if (index >= 1)
goto invalid_value;
_mesa_get_device_luid(ctx, v->value_int_2);