mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-20 17:28:33 +00:00
Code Issues Projects Releases Wiki Activity

glcaopengllayer: NULL some fields when freed

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6504>
This commit is contained in:
Matthew Waters 2024-04-02 12:35:37 +11:00 committed by GStreamer Marge Bot
parent b080d01b68
commit 2a02107c8d
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglcaopengllayer.m
View file

@ -51,9 +51,9 @@ _init_debug (void)
- (void)dealloc {
if (self->draw_notify)
self->draw_notify (self->draw_data);
self->draw_notify = NULL;
if (self->draw_context)
gst_object_unref (self->draw_context);
gst_clear_object (&self->draw_context);
g_weak_ref_clear (&self->gst_gl_window_ref);
self->gst_gl_context_ref = NULL;
@ -125,7 +125,7 @@ _context_ready (gpointer data)
if (gst_gl_context) {
fmt = gst_gl_context_cocoa_get_pixel_format (GST_GL_CONTEXT_COCOA (gst_gl_context));
gst_object_unref (gst_gl_context);
gst_clear_object (&gst_gl_context);
}
if (!fmt) {
@ -159,7 +159,6 @@ _context_ready (gpointer data)
if (!gst_gl_context) {
GST_ERROR ("failed to retrieve GStreamer GL context in CAOpenGLLayer");
gst_clear_object (&gst_gl_context);
return NULL;
}
external_context = (CGLContextObj) gst_gl_context_get_gl_context (gst_gl_context);
@ -174,8 +173,7 @@ _context_ready (gpointer data)
return NULL;
}
if (self->draw_context)
gst_object_unref (self->draw_context);
gst_clear_object (&self->draw_context);
if (kCGLNoError != CGLSetCurrentContext (self->gl_context)) {
GST_ERROR ("failed set cgl context %p current", self->gl_context);