XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

glamor: if glamor_get_modifiers make *num_modifiers 0, make *modifiers NULL

Browse Source 
This likely wasn't a problem, as *num_modifiers was 0, so likely no
data was read from a potentially uninitilaized pointer, but it's
still better to explicitly set it to NULL.

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2025-07-15 23:38:05 +03:00
committed by Enrico Weigelt
parent 7a4bf5ab10
commit 0f0b33b5b5
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
glamor/glamor_egl.c
View File

@@ -787,10 +787,12 @@ glamor_get_modifiers(ScreenPtr screen, uint32_t format,
#ifdef GLAMOR_HAS_EGL_QUERY_DMABUF
struct glamor_egl_screen_private *glamor_egl;
EGLint num;
#endif
/* Explicitly zero the count as the caller may ignore the return value */
/* Explicitly zero the count and modifiers as the caller may ignore the return value */
*num_modifiers = 0;
*modifiers = NULL;
#ifdef GLAMOR_HAS_EGL_QUERY_DMABUF
glamor_egl = glamor_egl_get_screen_private(xf86ScreenToScrn(screen));
if (!glamor_egl->dmabuf_capable)
@@ -814,11 +816,8 @@ glamor_get_modifiers(ScreenPtr screen, uint32_t format,
}
*num_modifiers = num;
return TRUE;
#else
*num_modifiers = 0;
return TRUE;
#endif
return TRUE;
}
const char *