OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
161ccda
)
avcodec/rscc: 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>
Mon, 31 Oct 2016 00:11:03 +0000
(
01:11
+0100)
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/rscc.c
patch
|
blob
|
history
diff --git
a/libavcodec/rscc.c
b/libavcodec/rscc.c
index
7f280a9
..
7eb8776
100644
(file)
--- a/
libavcodec/rscc.c
+++ b/
libavcodec/rscc.c
@@
-310,12
+310,15
@@
static int rscc_decode_frame(AVCodecContext *avctx, void *data,
frame->pict_type = AV_PICTURE_TYPE_P;
}
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
+ int size;
const uint8_t *pal = av_packet_get_side_data(avpkt,
AV_PKT_DATA_PALETTE,
-
NULL
);
- if (pal) {
+
&size
);
+ if (pal
&& size == AV_PKT_DATA_PALETTE
) {
frame->palette_has_changed = 1;
memcpy(ctx->pal, pal, AVPALETTE_SIZE);
+ } else if (pal) {
+ av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
}
memcpy (frame->data[1], ctx->pal, AVPALETTE_SIZE);
}