RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-26 00:31:12 +00:00
Code Issues Projects Releases Wiki Activity

lavf/rtpenc_jpeg: Error out for non-standard Huffman tables.

Browse Source 
Related to ticket #3823.
This commit is contained in:
Carl Eugen Hoyos 2015-07-09 20:03:38 +02:00
parent ad7c5cba4e
commit e786e96be7
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/rtpenc_jpeg.c
View File

@ -21,6 +21,7 @@
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "libavcodec/mjpeg.h" #include "libavcodec/mjpeg.h"
#include "libavcodec/jpegtables.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "rtpenc.h" #include "rtpenc.h"
@ -81,6 +82,25 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size)
"Only 1x1 chroma blocks are supported. Aborted!\n"); "Only 1x1 chroma blocks are supported. Aborted!\n");
return; return;
} }
} else if (buf[i + 1] == DHT) {
if ( AV_RB16(&buf[i + 2]) < 418
|| i + 420 >= size
|| buf[i + 4] != 0x00
|| buf[i + 33] != 0x01
|| buf[i + 62] != 0x10
|| buf[i + 241] != 0x11
|| memcmp(buf + i + 5, avpriv_mjpeg_bits_dc_luminance + 1, 16)
|| memcmp(buf + i + 21, avpriv_mjpeg_val_dc, 12)
|| memcmp(buf + i + 34, avpriv_mjpeg_bits_dc_chrominance + 1, 16)
|| memcmp(buf + i + 50, avpriv_mjpeg_val_dc, 12)
|| memcmp(buf + i + 63, avpriv_mjpeg_bits_ac_luminance + 1, 16)
|| memcmp(buf + i + 79, avpriv_mjpeg_val_ac_luminance, 162)
|| memcmp(buf + i + 242, avpriv_mjpeg_bits_ac_chrominance + 1, 16)
|| memcmp(buf + i + 258, avpriv_mjpeg_val_ac_chrominance, 162)) {
av_log(s1, AV_LOG_ERROR,
"RFC 2435 requires standard Huffman tables for jpeg\n");
return;
}
} else if (buf[i + 1] == SOS) { } else if (buf[i + 1] == SOS) {
/* SOS is last marker in the header */ /* SOS is last marker in the header */
i += AV_RB16(&buf[i + 2]) + 2; i += AV_RB16(&buf[i + 2]) + 2;