isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check the compositor isn't NULL before dereferencing it. Fixes #534569

Browse Source 
2008-05-24  Iain Holmes  <iain@gnome.org>

        * src/compositor/compositor.c: Check the compositor isn't NULL 
before 
        dereferencing it. Fixes #534569
        (meta_compositor_get_window_pixmap): Actually return a value


svn path=/trunk/; revision=3723
This commit is contained in:
Iain Holmes 2008-05-24 11:00:17 +00:00 committed by Iain Holmes
parent a5d2bdea55
commit 1f435cc1fc
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-05-24 Iain Holmes <iain@gnome.org>
* src/compositor/compositor.c: Check the compositor isn't NULL before
dereferencing it. Fixes #534569
(meta_compositor_get_window_pixmap): Actually return a value
2008-05-19 Iain Holmes <iain@gnome.org> 2008-05-19 Iain Holmes <iain@gnome.org>
* src/core/window.c: Applied patch from Ed Catmur to fix #528787 * src/core/window.c: Applied patch from Ed Catmur to fix #528787

21
src/compositor/compositor.c
View File

@ -21,6 +21,7 @@
#include <config.h> #include <config.h>
#include "compositor-private.h" #include "compositor-private.h"
#include "compositor-xrender.h"
MetaCompositor * MetaCompositor *
meta_compositor_new (MetaDisplay *display) meta_compositor_new (MetaDisplay *display)
@ -37,7 +38,7 @@ void
meta_compositor_destroy (MetaCompositor *compositor) meta_compositor_destroy (MetaCompositor *compositor)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->destroy) if (compositor && compositor->destroy)
compositor->destroy (compositor); compositor->destroy (compositor);
#endif #endif
} }
@ -49,7 +50,7 @@ meta_compositor_add_window (MetaCompositor *compositor,
XWindowAttributes *attrs) XWindowAttributes *attrs)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->add_window) if (compositor && compositor->add_window)
compositor->add_window (compositor, window, xwindow, attrs); compositor->add_window (compositor, window, xwindow, attrs);
#endif #endif
} }
@ -59,7 +60,7 @@ meta_compositor_remove_window (MetaCompositor *compositor,
Window xwindow) Window xwindow)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->remove_window) if (compositor && compositor->remove_window)
compositor->remove_window (compositor, xwindow); compositor->remove_window (compositor, xwindow);
#endif #endif
} }
@ -69,7 +70,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
MetaScreen *screen) MetaScreen *screen)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->manage_screen) if (compositor && compositor->manage_screen)
compositor->manage_screen (compositor, screen); compositor->manage_screen (compositor, screen);
#endif #endif
} }
@ -79,7 +80,7 @@ meta_compositor_unmanage_screen (MetaCompositor *compositor,
MetaScreen *screen) MetaScreen *screen)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->unmanage_screen) if (compositor && compositor->unmanage_screen)
compositor->unmanage_screen (compositor, screen); compositor->unmanage_screen (compositor, screen);
#endif #endif
} }
@ -90,7 +91,7 @@ meta_compositor_set_updates (MetaCompositor *compositor,
gboolean updates) gboolean updates)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->set_updates) if (compositor && compositor->set_updates)
compositor->set_updates (compositor, window, updates); compositor->set_updates (compositor, window, updates);
#endif #endif
} }
@ -101,7 +102,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
MetaWindow *window) MetaWindow *window)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->process_event) if (compositor && compositor->process_event)
compositor->process_event (compositor, event, window); compositor->process_event (compositor, event, window);
#endif #endif
} }
@ -111,8 +112,8 @@ meta_compositor_get_window_pixmap (MetaCompositor *compositor,
MetaWindow *window) MetaWindow *window)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->get_window_pixmap) if (compositor && compositor->get_window_pixmap)
compositor->get_window_pixmap (compositor, window); return compositor->get_window_pixmap (compositor, window);
else else
return None; return None;
#else #else
@ -126,7 +127,7 @@ meta_compositor_set_active_window (MetaCompositor *compositor,
MetaWindow *window) MetaWindow *window)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
if (compositor->set_active_window) if (compositor && compositor->set_active_window)
compositor->set_active_window (compositor, screen, window); compositor->set_active_window (compositor, screen, window);
#endif #endif
} }