[FFmpeg-cvslog] oggdec: free the ogg streams on read_header failure

[Reinhard Tartler]

ffmpeg | branch: release/0.7 | Reinhard Tartler <siretart at tauware.de> | Sat Jan 12 19:36:27 2013 +0100| [3bc9cfe66e1a34c6d9dc45fde2a44aa38e6363ce] | committer: Reinhard Tartler

oggdec: free the ogg streams on read_header failure

Plug an annoying memory leak on broken files.
(cherry picked from commit 89b51b570daa80e6e3790fcd449fe61fc5574e07)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit 42bd6d9cf681306d14c92af97a40116fe4eb2522)

Conflicts:

	libavformat/oggdec.c

Conflicts:

	libavformat/oggdec.c

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

 libavformat/oggdec.c |   34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index a28232a..cab6da7 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -492,14 +492,29 @@ static int ogg_get_length(AVFormatContext *s)
     return 0;
 }
 
-static int ogg_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int ogg_read_close(AVFormatContext *s)
 {
     struct ogg *ogg = s->priv_data;
     int i;
+
+    for (i = 0; i < ogg->nstreams; i++) {
+        av_free(ogg->streams[i].buf);
+        av_free(ogg->streams[i].private);
+    }
+    av_free(ogg->streams);
+    return 0;
+}
+
+static int ogg_read_header(AVFormatContext *s)
+{
+    struct ogg *ogg = s->priv_data;
+    int i, ret;
     ogg->curidx = -1;
     //linear headers seek from start
-    if (ogg_get_headers (s) < 0){
-        return -1;
+    ret = ogg_get_headers(s);
+    if (ret < 0) {
+        ogg_read_close(s);
+        return ret;
     }
 
     for (i = 0; i < ogg->nstreams; i++)
@@ -583,19 +598,6 @@ retry:
     return psize;
 }
 
-static int ogg_read_close(AVFormatContext *s)
-{
-    struct ogg *ogg = s->priv_data;
-    int i;
-
-    for (i = 0; i < ogg->nstreams; i++){
-        av_free (ogg->streams[i].buf);
-        av_free (ogg->streams[i].private);
-    }
-    av_free (ogg->streams);
-    return 0;
-}
-
 static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
                                   int64_t *pos_arg, int64_t pos_limit)
 {