Commits · 76961f4f42d28c7b4197c2cbef8bae3dc7b67379 · sixue.cheng / FFmpeg

10 Dec, 2016 2 commits

avutil: Add av_image_check_size2() · 76961f4f

Michael Niedermayer authored 8 years ago

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f542b152

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

76961f4f

avformat: Add max_streams option · 7dd1cc60

Michael Niedermayer authored 8 years ago


This allows user apps to stop OOM due to excessive number of streams
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1296f844

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

7dd1cc60

09 Dec, 2016 4 commits

avcodec/ffv1enc: Allocate smaller packet if the worst case size cannot be allocated · 667c9ed1

Michael Niedermayer authored 8 years ago


We are checking during encoding if there is enough space as version 4 needs that
check.

Fixes Ticket6005
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 38a7834b

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

667c9ed1

avcodec/mpeg4videodec: Fix undefined shifts in mpeg4_decode_sprite_trajectory() · efa164aa

Michael Niedermayer authored 8 years ago


Fixes: part of 670190.ogg
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8258e363

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

efa164aa

avformat/oggdec: Skip streams in duration correction that did not had their duration set. · 7c68d5e7

Michael Niedermayer authored 8 years ago


Fixes: part of 670190.ogg
Fixes integer overflow
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ee2a6f5d

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

7c68d5e7

avcodec/ffv1enc: Fix size of first slice · 0bcc7ea5

Michael Niedermayer authored 8 years ago

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cff1c0ed

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

0bcc7ea5

05 Dec, 2016 8 commits

Chagelog: update · b408dba2
Michael Niedermayer authored 8 years ago
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
b408dba2

configure: check for strtoull on msvc · c1435f9d

James Almer authored 8 years ago

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit b52d3574)

c1435f9d

http: move chunk handling from http_read_stream() to http_buf_read(). · 726faff0
Ronald S. Bultje authored 8 years ago
```
(cherry picked from commit 845bb401)
```
726faff0

http: make length/offset-related variables unsigned. · 2e3f0a1c

Ronald S. Bultje authored 8 years ago

Fixes #5992, reported and found by Paul Cher <paulcher@icloud.com>.

(cherry picked from commit 2a05c8f8)

2e3f0a1c

ffserver: Check chunk size · 1768e02a

Michael Niedermayer authored 8 years ago


Fixes out of array access

Fixes: poc_ffserver.py
Found-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5d25faa

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

1768e02a

Avoid using the term "file" and prefer "url" in some docs and comments · e0d1db72

Michael Niedermayer authored 8 years ago


This should make it less ambigous that these are URLs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5f27a9c

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

e0d1db72

avformat/rtmppkt: Check for packet size mismatches · a5513ae7

Michael Niedermayer authored 8 years ago


Fixes out of array access
Found-by: Paul Cher <paulcher@icloud.com>
Reviewed-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7d57ca4d

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

a5513ae7

zmqsend: Initialize ret to 0 · 9c0b2b9d

Timothy Gu authored 8 years ago

Fixes CID1396857.

(cherry picked from commit d903b4e3

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

9c0b2b9d

04 Dec, 2016 26 commits

avcodec/rawdec: check for side data before checking its size · d111c9ce

James Almer authored 8 years ago


Fixes valgrind warnings about usage of uninitialized values.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 51e32991)

d111c9ce

Update for version 3.0.5 · 6e1bc747
Michael Niedermayer authored 8 years ago
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
6e1bc747

avcodec/flacdec: Fix undefined shift in decode_subframe() · 2c6792b0

Michael Niedermayer authored 8 years ago


Fixes undefined behavior
Fixes: 639961-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1f5630af

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

2c6792b0

avcodec/get_bits: Fix get_sbits_long(0) · 66bf84e2

Michael Niedermayer authored 8 years ago


Fixes undefined behavior
Fixes: 640889-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c72fa432

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

66bf84e2

avformat/ffmdec: Check media type for chunks · 9f7eb718

Michael Niedermayer authored 8 years ago

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e706e2e7

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

9f7eb718

avcodec/flacdec: Fix signed integer overflow in decode_subframe_fixed() · 2d66fbc8

Michael Niedermayer authored 8 years ago


Fixes undefined behavior
Fixes: 640912-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 83a75bf6

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

2d66fbc8

avcodec/flacdsp_template: Fix undefined shift in flac_decorrelate_indep_c · 2f26f3de

Michael Niedermayer authored 8 years ago


Fixes: left shift of negative value
Fixes: 668346-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit acc163c6

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

2f26f3de

avformat/oggparsespeex: Check frames_per_packet and packet_size · e9003828

Michael Niedermayer authored 8 years ago


The speex specification does not seem to restrict these values, thus
the limits where choosen so as to avoid multiplicative overflow

Fixes undefined behavior
Fixes: 635422.ogg
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit afcf15b0

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

e9003828

avformat/utils: Check start/end before computing duration in update_stream_timings() · 66e8f87e

Michael Niedermayer authored 8 years ago


Fixes undefined behavior
Fixes: 637428.ogg
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 90da187f

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

66e8f87e

avcodec/flac_parser: Update nb_headers_buffered · 6bee6ef0

Michael Niedermayer authored 8 years ago


Fixes infinite loop
Fixes: fuzz.flac
Found-by: Frank Liberato <liberato@google.com>
Reviewed-by: Frank Liberato <liberato@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 24758588

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

6bee6ef0

avformat/idroqdec: Check chunk_size for being too large · ff01dbb6

Michael Niedermayer authored 8 years ago

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 744a0b52

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ff01dbb6

avformat/mpeg: Adjust vid probe threshold to correct mis-detection · 2caee485

Michael Niedermayer authored 8 years ago


Fixes: _ij.mp3
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4e5049a2

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

2caee485

avcodec/rv40: Test remaining space in loop of get_dimension() · 63caf187

Michael Niedermayer authored 8 years ago

Fixes infinite loop
Fixes: 178/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_RV40_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1546d487

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

63caf187

avcodec/ituh263dec: Avoid spending a long time in slice sync · 8ad4e1c1

Michael Niedermayer authored 8 years ago

Fixes: 177/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_FLV1_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2baf36ca

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

8ad4e1c1

avcodec/movtextdec: Add error message for tsmb_size check · 27fbf8f1

Michael Niedermayer authored 8 years ago

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0eb31980

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

27fbf8f1

avcodec/movtextdec: Fix tsmb_size check==0 check · 3f9a24f0

Michael Niedermayer authored 8 years ago

Fixes: 173/fuzz-3-ffmpeg_SUBTITLE_AV_CODEC_ID_MOV_TEXT_fuzzer

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a6099057

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

3f9a24f0

avcodec/movtextdec: Fix potential integer overflow · 083919e9

Michael Niedermayer authored 8 years ago

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6ea27157

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

083919e9

avcodec/sunrast: Fix input buffer pointer check · bc63205a

Michael Niedermayer authored 8 years ago


Fixes: out of array read
Fixes: poc.dat

Found-by: Bingchang, Liu @VARAS of IIE
Tested-by: bc L <l.bing.chang.bc@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 37138338

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

bc63205a

avcodec/tscc: Check side data size before use · 4251dc6d

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 979bca51

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

4251dc6d

avcodec/rawdec: Check side data size before use · 8fd3293f

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5f0bc021

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

8fd3293f

avcodec/msvideo1: Check side data size before use · 7affe327

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 161ccdaa

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

7affe327

avcodec/qpeg: Check side data size before use · 1bc7215e

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 16793504

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

1bc7215e

avcodec/qtrle: Check side data size before use · 51aa6d09

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7d196f2a

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

51aa6d09

avcodec/msrle: Check side data size before use · 136fc708

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a6330119

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

136fc708

avcodec/kmvc: Check side data size before use · adc86ad3

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2d99101d

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

adc86ad3

avcodec/idcinvideo: Check side data size before use · e0dd617e

Michael Niedermayer authored 8 years ago


Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a2b8dde6

)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

e0dd617e

GitLab

Menu