mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Fix GError leaks during failures

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=755140
This commit is contained in:
Vineeth T M 2015-09-17 13:35:02 +09:00 committed by Sebastian Dröge
parent 0cb160a685
commit 00438fdff0
7 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/gl/gstglbasemixer.c
View file

@ -496,6 +496,7 @@ context_error:
{ {
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND, ("%s", error->message), GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND, ("%s", error->message),
(NULL)); (NULL));
g_clear_error (&error);
return FALSE; return FALSE;
} }
} }

1
ext/gl/gstglstereosplit.c
View file

@ -587,6 +587,7 @@ context_error:
{ {
GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND, ("%s", error->message), GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND, ("%s", error->message),
(NULL)); (NULL));
g_clear_error (&error);
return FALSE; return FALSE;
} }
} }

1
ext/gl/gstgltestsrc.c
View file

@ -853,6 +853,7 @@ context_error:
{ {
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, ("%s", error->message), GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, ("%s", error->message),
(NULL)); (NULL));
g_clear_error (&error);
if (src->context) if (src->context)
gst_object_unref (src->context); gst_object_unref (src->context);
src->context = NULL; src->context = NULL;

2
ext/gtk/gtkgstglwidget.c
View file

@ -460,6 +460,7 @@ _get_gl_context (GtkGstGLWidget * gst_widget)
GST_ERROR_OBJECT (gst_widget, "Error creating GdkGLContext : %s", GST_ERROR_OBJECT (gst_widget, "Error creating GdkGLContext : %s",
error ? error->message : "No error set by Gdk"); error ? error->message : "No error set by Gdk");
g_clear_error (&error);
g_assert_not_reached (); g_assert_not_reached ();
return; return;
} }
@ -501,6 +502,7 @@ _get_gl_context (GtkGstGLWidget * gst_widget)
gst_gl_context_activate (priv->other_context, TRUE); gst_gl_context_activate (priv->other_context, TRUE);
if (!gst_gl_context_fill_info (priv->other_context, &error)) { if (!gst_gl_context_fill_info (priv->other_context, &error)) {
GST_ERROR ("failed to retrieve gdk context info: %s", error->message); GST_ERROR ("failed to retrieve gdk context info: %s", error->message);
g_clear_error (&error);
g_object_unref (priv->other_context); g_object_unref (priv->other_context);
priv->other_context = NULL; priv->other_context = NULL;
} else { } else {

1
gst-libs/gst/gl/gstglbasebuffer.c
View file

@ -110,6 +110,7 @@ _mem_create_gl (GstGLContext * context, struct create_data *transfer)
GST_CAT_ERROR (GST_CAT_GL_BASE_BUFFER, "Failed to create GL buffer: %s", GST_CAT_ERROR (GST_CAT_GL_BASE_BUFFER, "Failed to create GL buffer: %s",
error->message); error->message);
g_clear_error (&error);
} }
void void

1
gst-libs/gst/gl/gstglbasefilter.c
View file

@ -368,6 +368,7 @@ context_error:
{ {
GST_ELEMENT_ERROR (trans, RESOURCE, NOT_FOUND, ("%s", error->message), GST_ELEMENT_ERROR (trans, RESOURCE, NOT_FOUND, ("%s", error->message),
(NULL)); (NULL));
g_clear_error (&error);
return FALSE; return FALSE;
} }
error: error:

3
gst-libs/gst/gl/gstglfilter.c
View file

@ -178,7 +178,6 @@ gst_gl_filter_gl_start (GstGLBaseFilter * base_filter)
GstGLFilterClass *filter_class = GST_GL_FILTER_GET_CLASS (filter); GstGLFilterClass *filter_class = GST_GL_FILTER_GET_CLASS (filter);
GstGLContext *context = GST_GL_BASE_FILTER (filter)->context; GstGLContext *context = GST_GL_BASE_FILTER (filter)->context;
gint out_width, out_height; gint out_width, out_height;
GError *error = NULL;
out_width = GST_VIDEO_INFO_WIDTH (&filter->out_info); out_width = GST_VIDEO_INFO_WIDTH (&filter->out_info);
out_height = GST_VIDEO_INFO_HEIGHT (&filter->out_info); out_height = GST_VIDEO_INFO_HEIGHT (&filter->out_info);
@ -205,7 +204,7 @@ gst_gl_filter_gl_start (GstGLBaseFilter * base_filter)
context_error: context_error:
{ {
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND, ("%s", error->message), GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND, ("Could not generate FBO"),
(NULL)); (NULL));
return FALSE; return FALSE;
} }