summaryrefslogtreecommitdiff
path: root/libavformat/rtpenc_jpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-12 17:55:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-12 17:55:40 +0200
commit81198a68370e88f7d02f16de58db36713c2a50b6 (patch)
treed8b5ceaec4883bbf545415ff3284512f8b89f3ab /libavformat/rtpenc_jpeg.c
parentc3671e1d5760d79c083e7565d951f4628c06cf41 (diff)
downloadffmpeg-81198a68370e88f7d02f16de58db36713c2a50b6.tar.gz
avformat/rtpenc_jpeg: Check remaining buffer size for SOS
Fixes CID1238818 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_jpeg.c')
-rw-r--r--libavformat/rtpenc_jpeg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c
index 9a20cbc376..7ee26c435e 100644
--- a/libavformat/rtpenc_jpeg.c
+++ b/libavformat/rtpenc_jpeg.c
@@ -84,6 +84,11 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size)
} else if (buf[i + 1] == SOS) {
/* SOS is last marker in the header */
i += AV_RB16(&buf[i + 2]) + 2;
+ if (i > size) {
+ av_log(s1, AV_LOG_ERROR,
+ "Insufficient data. Aborted!\n");
+ return;
+ }
break;
}
}