From a336b4c10df3a1877b44d01e92bf15ccdd474e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 8 Oct 2006 16:59:31 +0000 Subject: [PATCH] gst-libs/gst/interfaces/xoverlay.c: Some more guards against invalid input. Original commit message from CVS: * gst-libs/gst/interfaces/xoverlay.c: (gst_x_overlay_set_xwindow_id), (gst_x_overlay_expose): Some more guards against invalid input. --- ChangeLog | 6 ++++++ gst-libs/gst/interfaces/xoverlay.c | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1be50841ab..e3905c0f64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-10-08 Tim-Philipp Müller + + * gst-libs/gst/interfaces/xoverlay.c: + (gst_x_overlay_set_xwindow_id), (gst_x_overlay_expose): + Some more guards against invalid input. + 2006-10-07 Julien MOUTTE * ext/pango/gsttextoverlay.c: (gst_text_overlay_text_event): diff --git a/gst-libs/gst/interfaces/xoverlay.c b/gst-libs/gst/interfaces/xoverlay.c index a21fa81590..0352fe7076 100644 --- a/gst-libs/gst/interfaces/xoverlay.c +++ b/gst-libs/gst/interfaces/xoverlay.c @@ -156,7 +156,12 @@ gst_x_overlay_base_init (gpointer g_class) void gst_x_overlay_set_xwindow_id (GstXOverlay * overlay, gulong xwindow_id) { - GstXOverlayClass *klass = GST_X_OVERLAY_GET_CLASS (overlay); + GstXOverlayClass *klass; + + g_return_if_fail (overlay != NULL); + g_return_if_fail (GST_IS_X_OVERLAY (overlay)); + + klass = GST_X_OVERLAY_GET_CLASS (overlay); if (klass->set_xwindow_id) { klass->set_xwindow_id (overlay, xwindow_id); @@ -224,7 +229,11 @@ gst_x_overlay_prepare_xwindow_id (GstXOverlay * overlay) void gst_x_overlay_expose (GstXOverlay * overlay) { - GstXOverlayClass *klass = GST_X_OVERLAY_GET_CLASS (overlay); + GstXOverlayClass *klass; + + g_return_if_fail (overlay != NULL); + + klass = GST_X_OVERLAY_GET_CLASS (overlay); if (klass->expose) { klass->expose (overlay);