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:
4a32692
)
truemotion2: Fix the buffer check
author
Luca Barbato
<lu_zero@gentoo.org>
Sun, 1 Nov 2015 03:07:47 +0000
(
04:07
+0100)
committer
Luca Barbato
<lu_zero@gentoo.org>
Mon, 2 Nov 2015 15:29:14 +0000
(16:29 +0100)
The variable skip contains the expected size in bytes.
Bug-Id: 906
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/truemotion2.c
patch
|
blob
|
history
diff --git
a/libavcodec/truemotion2.c
b/libavcodec/truemotion2.c
index
84e8e2a
..
1726440
100644
(file)
--- a/
libavcodec/truemotion2.c
+++ b/
libavcodec/truemotion2.c
@@
-291,7
+291,7
@@
static int tm2_read_stream(TM2Context *ctx, const uint8_t *buf, int stream_id, i
if (len == 0)
return 4;
- if (len >= INT_MAX
/4-1 || len < 0 || len
> buf_size) {
+ if (len >= INT_MAX
/ 4 - 1 || len < 0 || skip
> buf_size) {
av_log(ctx->avctx, AV_LOG_ERROR, "Error, invalid stream size.\n");
return AVERROR_INVALIDDATA;
}