[FFmpeg-cvslog] avformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory

Michael Niedermayer git at videolan.org
Thu Jan 8 15:07:16 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  8 14:50:07 2015 +0100| [50bb9b87ab6f3fe1e630a3e420f0bf39dbdde5e5] | committer: Michael Niedermayer

avformat/img2enc: Use avio_closep() 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=50bb9b87ab6f3fe1e630a3e420f0bf39dbdde5e5
---

 libavformat/img2enc.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 2b8b2d0..b0bd252 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -123,11 +123,11 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
         avio_write(pb[0], pkt->data                , ysize);
         avio_write(pb[1], pkt->data + ysize        , usize);
         avio_write(pb[2], pkt->data + ysize + usize, usize);
-        avio_close(pb[1]);
-        avio_close(pb[2]);
+        avio_closep(&pb[1]);
+        avio_closep(&pb[2]);
         if (desc->nb_components > 3) {
             avio_write(pb[3], pkt->data + ysize + 2*usize, ysize);
-            avio_close(pb[3]);
+            avio_closep(&pb[3]);
         }
     } else if (img->muxer) {
         int ret;
@@ -165,7 +165,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     }
     avio_flush(pb[0]);
     if (!img->is_pipe) {
-        avio_close(pb[0]);
+        avio_closep(&pb[0]);
     }
 
     img->img_number++;



More information about the ffmpeg-cvslog mailing list