omxvideodec: Add some more checks for OMX buffer sizes

diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 103bfe18baf88f061d8bc2a86a1b3be19d683772..cfa9c857bd900710528c8dd79abbcbb4aa8acc66 100644 (file)
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1129,10 +1129,14 @@ gst_omx_video_dec_handle_frame (GstBaseVideoDecoder * decoder,
 
     g_assert (acq_ret == GST_OMX_ACQUIRE_BUFFER_OK && buf != NULL);
 
+    if (buf->omx_buf->nAllocLen - buf->omx_buf->nOffset <= 0)
+      goto full_buffer;
+
     if (self->codec_data) {
       codec_data = self->codec_data;
 
-      if (buf->omx_buf->nAllocLen < GST_BUFFER_SIZE (codec_data)) {
+      if (buf->omx_buf->nAllocLen - buf->omx_buf->nOffset <
+          GST_BUFFER_SIZE (codec_data)) {
         gst_omx_port_release_buffer (self->in_port, buf);
         goto too_large_codec_data;
       }
@@ -1205,6 +1209,15 @@ gst_omx_video_dec_handle_frame (GstBaseVideoDecoder * decoder,
 
   return GST_FLOW_OK;
 
+full_buffer:
+  {
+    GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
+        ("Got OpenMAX buffer with no free space (%p, %u/%u)", buf,
+            buf->omx_buf->nOffset, buf->omx_buf->nAllocLen));
+    gst_omx_port_release_buffer (self->in_port, buf);
+    return GST_FLOW_ERROR;
+  }
+
 too_large_codec_data:
   {
     GST_ELEMENT_ERROR (self, STREAM, FORMAT, (NULL),