mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-07 15:15:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: Set pAppPrivate of buffers to NULL when deallocating buffers

Browse source 
This prevents usage of freed memory later if the OMX component
has weird behaviour.
This commit is contained in:
Sebastian Dröge 2011-08-10 08:53:05 +02:00
parent 2ea5bdf553
commit 8fd4eaae69
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
omx/gstomx.c
View file

@ -312,8 +312,16 @@ EmptyBufferDone (OMX_HANDLETYPE hComponent, OMX_PTR pAppData,
OMX_BUFFERHEADERTYPE * pBuffer)
{
GstOMXBuffer *buf = pBuffer->pAppPrivate;
GstOMXPort *port = buf->port;
GstOMXComponent *comp = port->comp;
GstOMXPort *port;
GstOMXComponent *comp;
if (buf == NULL) {
GST_ERROR ("Have unknown or deallocated buffer %p", pBuffer);
return OMX_ErrorNone;
}
port = buf->port;
comp = port->comp;
g_assert (buf->omx_buf == pBuffer);
@ -335,8 +343,16 @@ FillBufferDone (OMX_HANDLETYPE hComponent, OMX_PTR pAppData,
OMX_BUFFERHEADERTYPE * pBuffer)
{
GstOMXBuffer *buf = pBuffer->pAppPrivate;
GstOMXPort *port = buf->port;
GstOMXComponent *comp = port->comp;
GstOMXPort *port;
GstOMXComponent *comp;
if (buf == NULL) {
GST_ERROR ("Have unknown or deallocated buffer %p", pBuffer);
return OMX_ErrorNone;
}
port = buf->port;
comp = port->comp;
g_assert (buf->omx_buf == pBuffer);
@ -1344,6 +1360,7 @@ gst_omx_port_deallocate_buffers_unlocked (GstOMXPort * port)
*/
if (buf->omx_buf) {
g_assert (buf == buf->omx_buf->pAppPrivate);
buf->omx_buf->pAppPrivate = NULL;
tmp = OMX_FreeBuffer (comp->handle, port->index, buf->omx_buf);
if (tmp != OMX_ErrorNone) {
GST_ERROR_OBJECT (comp->parent,