frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: NULL-protect GLAMOR_PIXMAP_PRIV_HAS_FBO() 

It could potentially be called with NULL pointer, but can't handle it,
so when that happens, it's a bug. Adding a BUG_RETURN_VAL() call here,
so it's giving us a hint where to look at.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-09 14:54:33 +02:00
parent 8b970b4bde
commit 5fd11ec4a6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glamor/glamor_utils.h
View File

@ -32,6 +32,8 @@
#ifndef __GLAMOR_UTILS_H__ #ifndef __GLAMOR_UTILS_H__
#define __GLAMOR_UTILS_H__ #define __GLAMOR_UTILS_H__
#include "os/bug_priv.h"
#include "glamor_prepare.h" #include "glamor_prepare.h"
#include "mipict.h" #include "mipict.h"
@ -570,7 +572,10 @@
&& (_w_) <= _glamor_->max_fbo_size \ && (_w_) <= _glamor_->max_fbo_size \
&& (_h_) <= _glamor_->max_fbo_size) && (_h_) <= _glamor_->max_fbo_size)
#define GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv) (pixmap_priv->gl_fbo == GLAMOR_FBO_NORMAL) static inline Bool GLAMOR_PIXMAP_PRIV_HAS_FBO(glamor_pixmap_private *pixmap_priv) {
BUG_RETURN_VAL(!pixmap_priv, FALSE);
return pixmap_priv->gl_fbo == GLAMOR_FBO_NORMAL;
}
#define REVERT_NONE 0 #define REVERT_NONE 0
#define REVERT_NORMAL 1 #define REVERT_NORMAL 1