From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 25 Mar 2015 15:19:30 +0000 (+0000)
Subject: glarea: Check that the context is not NULL
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9977
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fae3eaffcd4457c29db2ffc4a02c99c037fd3148;p=gtk4.git

glarea: Check that the context is not NULL

The public API should perform more checks when it comes to an NULL
context.

https://bugzilla.gnome.org/show_bug.cgi?id=746746
---

diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
index 1936a7b47c..90ab9fc523 100644
--- a/gtk/gtkglarea.c
+++ b/gtk/gtkglarea.c
@@ -448,6 +448,11 @@ gtk_gl_area_attach_buffers (GtkGLArea *area)
 {
   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
 
+  g_return_if_fail (GTK_IS_GL_AREA (area));
+
+  if (priv->context == NULL)
+    return;
+
   gtk_gl_area_make_current (area);
 
   if (!priv->have_buffers)
@@ -631,6 +636,9 @@ gtk_gl_area_draw (GtkWidget *widget,
       return FALSE;
     }
 
+  if (priv->context == NULL)
+    return FALSE;
+
   gtk_gl_area_make_current (area);
 
   gtk_gl_area_attach_buffers (area);
@@ -1301,6 +1309,6 @@ gtk_gl_area_make_current (GtkGLArea *area)
 
   g_return_if_fail (gtk_widget_get_realized (widget));
 
-  if (priv->context)
+  if (priv->context != NULL)
     gdk_gl_context_make_current (priv->context);
 }