rtpdec_h264: Check the available data length before reading

This makes sure the length is checked for STAP-A type packets. Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago · 5245adb963
parent de26a4b699
commit 5245adb963
1 changed files with 2 additions and 2 deletions
--- a/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@ -218,7 +218,7 @@ static int h264_handle_packet(AVFormatContext *ctx,
                const uint8_t *src= buf;
                int src_len= len;

-                do {
+                while (src_len > 2) {
                    uint16_t nal_size = AV_RB16(src); // this going to be a problem if unaligned (can it be?)

                    // consume the length of the aggregate...
@ -252,7 +252,7 @@ static int h264_handle_packet(AVFormatContext *ctx,
                    if (src_len < 0)
                        av_log(ctx, AV_LOG_ERROR,
                               "Consumed more bytes than we got! (%d)\n", src_len);
-                } while (src_len > 2);      // because there could be rtp padding..
+                }

                if(pass==0) {
                    // now we know the total size of the packet (with the start sequences added)