flv: Validate the packet size

Message ID 20170420160811.9B1695DB0C@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau April 20, 2017, 4:08 p.m.
Module: libav
Branch: master
Commit: 279e3aaa14daba6b7a37d75f3fb6e29c732d123f

Author:    Luca Barbato <lu_zero@gentoo.org>
Committer: Luca Barbato <lu_zero@gentoo.org>
Date:      Mon Apr 17 14:10:52 2017 +0000

flv: Validate the packet size

Size can be negative at that point.

Bug-Id: 1041
CC: libav-stable@libav.org

---

 libavformat/flvdec.c | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 693c859..1b29740 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -912,6 +912,12 @@  skip:
         st->codecpar->codec_id == AV_CODEC_ID_H264) {
         int type = avio_r8(s->pb);
         size--;
+
+        if (size < 0) {
+            ret = AVERROR_INVALIDDATA;
+            goto leave;
+        }
+
         if (st->codecpar->codec_id == AV_CODEC_ID_H264) {
             // sign extension
             int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000;