orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore-x: add more null checks for functions 

@fix
This commit is contained in:
Mike Blumenkrantz 2018-01-22 17:34:20 -05:00
parent 7c087d209a
commit ff1a0475c3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/ecore_x/ecore_x.c
View File

@ -983,7 +983,7 @@ ecore_x_screen_size_get(const Ecore_X_Screen *screen,
LOGFN(__FILE__, __LINE__, __FUNCTION__); LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (w) *w = 0; if (w) *w = 0;
if (h) *h = 0; if (h) *h = 0;
if (!s) return; EINA_SAFETY_ON_NULL_RETURN(screen);
if (w) *w = s->width; if (w) *w = s->width;
if (h) *h = s->height; if (h) *h = s->height;
} }
@ -1016,6 +1016,7 @@ ecore_x_screen_count_get(void)
EAPI int EAPI int
ecore_x_screen_index_get(const Ecore_X_Screen *screen) ecore_x_screen_index_get(const Ecore_X_Screen *screen)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(screen, -1);
return XScreenNumberOfScreen((Screen *)screen); return XScreenNumberOfScreen((Screen *)screen);
} }
@ -1870,6 +1871,7 @@ ecore_x_window_button_ungrab(Ecore_X_Window win,
int mod, int mod,
int any_mod) int any_mod)
{ {
EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
_ecore_x_window_button_ungrab_internal(win, button, mod, any_mod); _ecore_x_window_button_ungrab_internal(win, button, mod, any_mod);
_ecore_x_sync_magic_send(1, win, button, mod, any_mod); _ecore_x_sync_magic_send(1, win, button, mod, any_mod);
// _ecore_x_window_grab_remove(win, button, mod, any_mod); // _ecore_x_window_grab_remove(win, button, mod, any_mod);
@ -1974,6 +1976,7 @@ ecore_x_window_key_grab(Ecore_X_Window win,
{ {
Keygrab *t; Keygrab *t;
EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
_ecore_x_window_key_grab_internal(win, key, mod, any_mod); _ecore_x_window_key_grab_internal(win, key, mod, any_mod);
_ecore_key_grabs_num++; _ecore_key_grabs_num++;
t = realloc(_ecore_key_grabs, t = realloc(_ecore_key_grabs,
@ -2080,6 +2083,7 @@ ecore_x_window_key_ungrab(Ecore_X_Window win,
int mod, int mod,
int any_mod) int any_mod)
{ {
EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
_ecore_x_window_key_ungrab_internal(win, key, mod, any_mod); _ecore_x_window_key_ungrab_internal(win, key, mod, any_mod);
_ecore_x_sync_magic_send(2, win, XStringToKeysym(key), mod, any_mod); _ecore_x_sync_magic_send(2, win, XStringToKeysym(key), mod, any_mod);
// _ecore_x_key_grab_remove(win, key, mod, any_mod); // _ecore_x_key_grab_remove(win, key, mod, any_mod);