rtpdec_asf: Don't free the payload context in the .close function

[ffmpeg] / libavformat / xwma.c

diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index baabf5775e178f8fc916fa36839e5c39a744af0c..4a30001f765473f3148264b59fa28e4a2a4dbe16 100644 (file)
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -20,6 +20,7 @@
  */
 
 #include <inttypes.h>
+#include <stdint.h>
 
 #include "avformat.h"
 #include "internal.h"
@@ -29,7 +30,7 @@
  * Demuxer for xWMA, a Microsoft audio container used by XAudio 2.
  */
 
-typedef struct {
+typedef struct XWMAContext {
     int64_t data_end;
 } XWMAContext;
 
@@ -43,7 +44,7 @@ static int xwma_probe(AVProbeData *p)
 static int xwma_read_header(AVFormatContext *s)
 {
     int64_t size;
-    int ret;
+    int ret = 0;
     uint32_t dpds_table_size = 0;
     uint32_t *dpds_table = 0;
     unsigned int tag;
@@ -85,9 +86,8 @@ static int xwma_read_header(AVFormatContext *s)
      * anyway.
      */
     if (st->codec->codec_id != AV_CODEC_ID_WMAV2) {
-        av_log(s, AV_LOG_WARNING, "unexpected codec (tag 0x04%x; id %d)\n",
+        avpriv_request_sample(s, "Unexpected codec (tag 0x04%x; id %d)",
                               st->codec->codec_tag, st->codec->codec_id);
-        av_log_ask_for_sample(s, NULL);
     } else {
         /* In all xWMA files I have seen, there is no extradata. But the WMA
          * codecs require extradata, so we provide our own fake extradata.
@@ -101,9 +101,8 @@ static int xwma_read_header(AVFormatContext *s)
              * if it will work, but just go on and try it, after asking
              * the user for a sample.
              */
-            av_log(s, AV_LOG_WARNING, "unexpected extradata (%d bytes)\n",
+            avpriv_request_sample(s, "Unexpected extradata (%d bytes)",
                                   st->codec->extradata_size);
-            av_log_ask_for_sample(s, NULL);
         } else {
             st->codec->extradata_size = 6;
             st->codec->extradata      = av_mallocz(6 + FF_INPUT_BUFFER_PADDING_SIZE);
@@ -131,8 +130,10 @@ static int xwma_read_header(AVFormatContext *s)
 
     /* parse the remaining RIFF chunks */
     for (;;) {
-        if (pb->eof_reached)
-            return -1;
+        if (pb->eof_reached) {
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
         /* read next chunk tag */
         tag = avio_rl32(pb);
         size = avio_rl32(pb);
@@ -153,7 +154,8 @@ static int xwma_read_header(AVFormatContext *s)
             /* Error out if there is more than one dpds chunk. */
             if (dpds_table) {
                 av_log(s, AV_LOG_ERROR, "two dpds chunks present\n");
-                return -1;
+                ret = AVERROR_INVALIDDATA;
+                goto fail;
             }
 
             /* Compute the number of entries in the dpds chunk. */
@@ -185,8 +187,10 @@ static int xwma_read_header(AVFormatContext *s)
     }
 
     /* Determine overall data length */
-    if (size < 0)
-        return -1;
+    if (size < 0) {
+        ret = AVERROR_INVALIDDATA;
+        goto fail;
+    }
     if (!size) {
         xwma->data_end = INT64_MAX;
     } else
@@ -200,6 +204,15 @@ static int xwma_read_header(AVFormatContext *s)
 
         /* Estimate the duration from the total number of output bytes. */
         const uint64_t total_decoded_bytes = dpds_table[dpds_table_size - 1];
+
+        if (!bytes_per_sample) {
+            av_log(s, AV_LOG_ERROR,
+                   "Invalid bits_per_coded_sample %d for %d channels\n",
+                   st->codec->bits_per_coded_sample, st->codec->channels);
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
+
         st->duration = total_decoded_bytes / bytes_per_sample;
 
         /* Use the dpds data to build a seek table.  We can only do this after
@@ -232,9 +245,10 @@ static int xwma_read_header(AVFormatContext *s)
         st->duration = (size<<3) * st->codec->sample_rate / st->codec->bit_rate;
     }
 
+fail:
     av_free(dpds_table);
 
-    return 0;
+    return ret;
 }
 
 static int xwma_read_packet(AVFormatContext *s, AVPacket *pkt)