projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52ff8ca
)
Check size_bmp more fully
37/252737/3
tizen
author
hj kim
<backto.kim@samsung.com>
Tue, 2 Feb 2021 04:51:32 +0000
(13:51 +0900)
committer
hj kim
<backto.kim@samsung.com>
Tue, 2 Feb 2021 05:49:27 +0000
(
05:49
+0000)
patch from ffmpeg to fix CVE-2018-1999011
Change-Id: Ic1bf9125a7ac885db6ac618a5a19ba17e7b292ab
libavformat/asfdec.c
[changed mode: 0755->0644]
patch
|
blob
|
history
diff --git
a/libavformat/asfdec.c
b/libavformat/asfdec.c
old mode 100755
(executable)
new mode 100644
(file)
index
d508d79
..
449be24
--- a/
libavformat/asfdec.c
+++ b/
libavformat/asfdec.c
@@
-704,7
+704,8
@@
static int parse_video_info(AVIOContext *pb, AVStream *st)
st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
size_bmp = FFMAX(size_asf, size_bmp);
- if (size_bmp > BMP_HEADER_SIZE) {
+ if (size_bmp > BMP_HEADER_SIZE &&
+ size_bmp < INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) {
int ret;
st->codecpar->extradata_size = size_bmp - BMP_HEADER_SIZE;
if (!(st->codecpar->extradata = av_malloc(st->codecpar->extradata_size +