From 93b9f870ce49f348304510d83c6f922c00df5994 Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Tue, 9 May 2017 14:56:09 -0400 Subject: [PATCH] matroxsrc: error out on buffer allocation failure --- sys/matrox/gstmatroxsrc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/matrox/gstmatroxsrc.c b/sys/matrox/gstmatroxsrc.c index a6e14e9..010b0a2 100644 --- a/sys/matrox/gstmatroxsrc.c +++ b/sys/matrox/gstmatroxsrc.c @@ -459,9 +459,7 @@ gst_matroxsrc_start (GstBaseSrc * bsrc) src->height = vinfo.height; src->gst_stride = GST_VIDEO_INFO_COMP_STRIDE (&vinfo, 0); - if (src->MilGrabBufferList) { - g_free (src->MilGrabBufferList); - } + g_assert (src->MilGrabBufferList == NULL); src->MilGrabBufferList = g_new (MIL_ID, src->num_capture_buffers); for (i = 0; i < src->num_capture_buffers; i++) { if (src->color_mode == M_MONOCHROME) { @@ -479,7 +477,9 @@ gst_matroxsrc_start (GstBaseSrc * bsrc) if (src->MilGrabBufferList[i]) { MbufClear (src->MilGrabBufferList[i], 0xFF); } else { - break; + GST_ELEMENT_ERROR (src, RESOURCE, FAILED, + ("Failed to allocate a MIL buffer"), (NULL)); + return FALSE; } }