nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't trust xinerama not to return NULL

Browse source 
We check that xinerama is active already, but someone got a NULL here.
This commit is contained in:
Mikael Magnusson 2009-07-05 14:24:14 +02:00
parent 923a11ea30
commit 7351d86443
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
openbox/extensions.c
View file

@ -85,7 +85,11 @@ void extensions_query_all(void)
void extensions_xinerama_screens(Rect **xin_areas, guint *nxin) void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
{ {
guint i; guint i;
gint l, r, t, b; gint n, l, r, t, b;
#ifdef XINERAMA
XineramaScreenInfo *info;
#endif
if (ob_debug_xinerama) { if (ob_debug_xinerama) {
gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)); gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)); gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
@ -94,12 +98,9 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
RECT_SET((*xin_areas)[0], 0, 0, w/2, h); RECT_SET((*xin_areas)[0], 0, 0, w/2, h);
RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h); RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h);
} }
else
#ifdef XINERAMA #ifdef XINERAMA
if (extensions_xinerama) { else if (extensions_xinerama &&
guint i; (info = XineramaQueryScreens(ob_display, &n))) {
gint n;
XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n);
*nxin = n; *nxin = n;
*xin_areas = g_new(Rect, *nxin + 1); *xin_areas = g_new(Rect, *nxin + 1);
for (i = 0; i < *nxin; ++i) for (i = 0; i < *nxin; ++i)
@ -107,8 +108,8 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
info[i].width, info[i].height); info[i].width, info[i].height);
XFree(info); XFree(info);
} }
else
#endif #endif
else
{ {
*nxin = 1; *nxin = 1;
*xin_areas = g_new(Rect, *nxin + 1); *xin_areas = g_new(Rect, *nxin + 1);