[FFmpeg-cvslog] r16857 - trunk/libavdevice/v4l2.c

lucabe subversion
Fri Jan 30 13:41:45 CET 2009


Author: lucabe
Date: Fri Jan 30 13:41:44 2009
New Revision: 16857

Log:
If AVPacket->data == NULL, the packet does not contain any buffer to
be freed.
This fixes a double free on exit.

Modified:
   trunk/libavdevice/v4l2.c

Modified: trunk/libavdevice/v4l2.c
==============================================================================
--- trunk/libavdevice/v4l2.c	Fri Jan 30 09:18:06 2009	(r16856)
+++ trunk/libavdevice/v4l2.c	Fri Jan 30 13:41:44 2009	(r16857)
@@ -325,6 +325,10 @@ static void mmap_release_buffer(AVPacket
     int res, fd;
     struct buff_data *buf_descriptor = pkt->priv;
 
+    if (pkt->data == NULL) {
+         return;
+    }
+
     memset(&buf, 0, sizeof(struct v4l2_buffer));
     buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     buf.memory = V4L2_MEMORY_MMAP;




More information about the ffmpeg-cvslog mailing list