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:
3d40263
)
avcodec/dxv: Check remaining bytes in dxv_decompress_raw()
author
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 4 Jun 2017 13:41:18 +0000
(15:41 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 4 Jun 2017 15:51:02 +0000
(17:51 +0200)
Fixes: Timeout
Fixes: 2006/clusterfuzz-testcase-minimized-
5766515037044736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dxv.c
patch
|
blob
|
history
diff --git
a/libavcodec/dxv.c
b/libavcodec/dxv.c
index
4b1c2d2
..
6f3c075
100644
(file)
--- a/
libavcodec/dxv.c
+++ b/
libavcodec/dxv.c
@@
-335,6
+335,9
@@
static int dxv_decompress_raw(AVCodecContext *avctx)
DXVContext *ctx = avctx->priv_data;
GetByteContext *gbc = &ctx->gbc;
+ if (bytestream2_get_bytes_left(gbc) < ctx->tex_size)
+ return AVERROR_INVALIDDATA;
+
bytestream2_get_buffer(gbc, ctx->tex_data, ctx->tex_size);
return 0;
}