summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/swfdec.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index c77e28f0c9..c36c024168 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -455,10 +455,20 @@ bitmap_end_skip:
/* old SWF files containing SOI/EOI as data start */
/* files created by swink have reversed tag */
pkt->size -= 4;
- avio_read(pb, pkt->data, pkt->size);
+ res = avio_read(pb, pkt->data, pkt->size);
} else {
- avio_read(pb, pkt->data + 4, pkt->size - 4);
+ res = avio_read(pb, pkt->data + 4, pkt->size - 4);
+ if (res >= 0)
+ res += 4;
}
+ if (res != pkt->size) {
+ if (res < 0) {
+ av_free_packet(pkt);
+ return res;
+ }
+ av_shrink_packet(pkt, res);
+ }
+
pkt->pos = pos;
pkt->stream_index = st->index;
return pkt->size;