[FFmpeg-cvslog] avdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory

Michael Niedermayer git at videolan.org
Fri Dec 12 14:49:54 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 12 14:46:46 2014 +0100| [eb725235b03fbaffd670409f12f3f9a71dd12cfd] | committer: Michael Niedermayer

avdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb725235b03fbaffd670409f12f3f9a71dd12cfd
---

 libavdevice/v4l2.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 8695645..2969980 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -356,7 +356,7 @@ static int mmap_init(AVFormatContext *ctx)
     s->buf_len = av_malloc_array(s->buffers, sizeof(unsigned int));
     if (!s->buf_len) {
         av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer sizes\n");
-        av_free(s->buf_start);
+        av_freep(&s->buf_start);
         return AVERROR(ENOMEM);
     }
 
@@ -634,8 +634,8 @@ static void mmap_close(struct video_data *s)
     for (i = 0; i < s->buffers; i++) {
         v4l2_munmap(s->buf_start[i], s->buf_len[i]);
     }
-    av_free(s->buf_start);
-    av_free(s->buf_len);
+    av_freep(&s->buf_start);
+    av_freep(&s->buf_len);
 }
 
 static int v4l2_set_parameters(AVFormatContext *ctx)



More information about the ffmpeg-cvslog mailing list