ogg: fix double free when finding length of small chained oggs.
authorRonald S. Bultje <rsbultje@gmail.com>
Wed, 29 Jun 2011 05:24:21 +0000 (22:24 -0700)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Fri, 1 Jul 2011 00:41:30 +0000 (02:41 +0200)
ogg_save() copies streams[], but doesn't keep track of free()'ed
struct members. Thus, if in between a call to ogg_save() and
ogg_restore(), streams[].private was free()'ed, this would result
in a double free -> crash, which happened when e.g. playing small
chained ogg fragments.
(cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533)

libavformat/oggdec.c

index 655da35..dc9f7b6 100644 (file)
@@ -240,7 +240,8 @@ static int ogg_read_page(AVFormatContext *s, int *str)
 
             for (n = 0; n < ogg->nstreams; n++) {
                 av_freep(&ogg->streams[n].buf);
-                av_freep(&ogg->streams[n].private);
+                if (!ogg->state || ogg->state->streams[n].private != ogg->streams[n].private)
+                    av_freep(&ogg->streams[n].private);
             }
             ogg->curidx   = -1;
             ogg->nstreams = 0;