git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a633011
)
avcodec/qtrle: Check side data size before use
author
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 30 Oct 2016 14:12:12 +0000
(15:12 +0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 30 Oct 2016 23:27:45 +0000
(
00:27
+0100)
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qtrle.c
patch
|
blob
|
history
diff --git
a/libavcodec/qtrle.c
b/libavcodec/qtrle.c
index
d9d27f0
..
1b0d201
100644
(file)
--- a/
libavcodec/qtrle.c
+++ b/
libavcodec/qtrle.c
@@
-506,11
+506,14
@@
static int qtrle_decode_frame(AVCodecContext *avctx,
}
if(has_palette) {
- const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+ int size;
+ const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
- if (pal) {
+ if (pal
&& size == AVPALETTE_SIZE
) {
s->frame->palette_has_changed = 1;
memcpy(s->pal, pal, AVPALETTE_SIZE);
+ } else if (pal) {
+ av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
}
/* make the palette available on the way out */