rtmpproto: Validate the embedded flv packet size before copying
authorMartin Storsjö <martin@martin.st>
Thu, 3 Oct 2013 11:49:50 +0000 (13:49 +0200)
committerMartin Storsjö <martin@martin.st>
Fri, 4 Oct 2013 06:25:10 +0000 (09:25 +0300)
This wasn't an issue prior to 58404738, when the whole RTMP packet
was copied at once and the length of the individual embedded flv
packets only were validated by the flv demuxer.

Prior to this patch, this could lead to reads and writes out of bound.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/rtmpproto.c

index e7e37a3..3dbfc92 100644 (file)
@@ -2221,6 +2221,8 @@ static int handle_metadata(RTMPContext *rt, RTMPPacket *pkt)
             pts = cts;
         ts += cts - pts;
         pts = cts;
+        if (size + 3 + 4 > pkt->data + pkt->size - next)
+            break;
         bytestream_put_byte(&p, type);
         bytestream_put_be24(&p, size);
         bytestream_put_be24(&p, ts);