Canopus HQX decoder

[ffmpeg] / libavformat / ape.c

diff --git a/libavformat/ape.c b/libavformat/ape.c
index e70fcfd017b71aaea8b0cb9212b318d7b261e1a8..09a756da609a2f2258f26389b0a968a90a09544b 100644 (file)
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -42,7 +42,7 @@
 
 #define APE_EXTRADATA_SIZE 6
 
-typedef struct {
+typedef struct APEFrame {
     int64_t pos;
     int nblocks;
     int size;
@@ -50,7 +50,7 @@ typedef struct {
     int64_t pts;
 } APEFrame;
 
-typedef struct {
+typedef struct APEContext {
     /* Derived fields */
     uint32_t junklength;
     uint32_t firstframe;
@@ -134,7 +134,7 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
                 av_log(s, AV_LOG_DEBUG, "%8d   %"PRIu32" (%"PRIu32" bytes)",
                        i, ape_ctx->seektable[i],
                        ape_ctx->seektable[i + 1] - ape_ctx->seektable[i]);
-                if (s->bittable)
+                if (ape_ctx->bittable)
                     av_log(s, AV_LOG_DEBUG, " + %2d bits\n",
                            ape_ctx->bittable[i]);
                 av_log(s, AV_LOG_DEBUG, "\n");
@@ -260,7 +260,7 @@ static int ape_read_header(AVFormatContext * s)
                ape->totalframes);
         return -1;
     }
-    if (ape->seektablelength && (ape->seektablelength / sizeof(*ape->seektable)) < ape->totalframes) {
+    if (ape->seektablelength / sizeof(*ape->seektable) < ape->totalframes) {
         av_log(s, AV_LOG_ERROR,
                "Number of seek entries is less than number of frames: %zu vs. %"PRIu32"\n",
                ape->seektablelength / sizeof(*ape->seektable), ape->totalframes);
@@ -283,13 +283,13 @@ static int ape_read_header(AVFormatContext * s)
         ape->seektable = av_malloc(ape->seektablelength);
         if (!ape->seektable)
             return AVERROR(ENOMEM);
-        for (i = 0; i < ape->seektablelength / sizeof(uint32_t); i++)
+        for (i = 0; i < ape->seektablelength / sizeof(uint32_t) && !pb->eof_reached; i++)
             ape->seektable[i] = avio_rl32(pb);
         if (ape->fileversion < 3810) {
             ape->bittable = av_malloc(ape->totalframes);
             if (!ape->bittable)
                 return AVERROR(ENOMEM);
-            for (i = 0; i < ape->totalframes; i++)
+            for (i = 0; i < ape->totalframes && !pb->eof_reached; i++)
                 ape->bittable[i] = avio_r8(pb);
         }
     }