generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtpdec_h264: Check the available data length before reading

Browse Source 
This makes sure the length is checked for STAP-A type packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2012-05-04 22:45:11 +03:00
parent de26a4b699
commit 5245adb963
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpdec_h264.c
View File

@@ -218,7 +218,7 @@ static int h264_handle_packet(AVFormatContext *ctx,
const uint8_t *src= buf; const uint8_t *src= buf;
int src_len= len; 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?) uint16_t nal_size = AV_RB16(src); // this going to be a problem if unaligned (can it be?)
// consume the length of the aggregate... // consume the length of the aggregate...
@@ -252,7 +252,7 @@ static int h264_handle_packet(AVFormatContext *ctx,
if (src_len < 0) if (src_len < 0)
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Consumed more bytes than we got! (%d)\n", src_len); "Consumed more bytes than we got! (%d)\n", src_len);
} while (src_len > 2); // because there could be rtp padding.. }
if(pass==0) { if(pass==0) {
// now we know the total size of the packet (with the start sequences added) // now we know the total size of the packet (with the start sequences added)