Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-13avcodec/pngdec: Check that previous_picture has same w/h/formatMichael Niedermayer
Fixes: out of array access Fixes: 15540/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APNG_fuzzer-5684905029140480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-06-25avcodec/pngdec: Check input spaceMichael Niedermayer
Fixes: Timeout (33sec -> 78ms) Fixes: 14668/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LSCR_fuzzer-5767073352908800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-05-25avcodec/pngdec: Check nb_blocksMichael Niedermayer
Fixes: Timeout (23sec -> 0.5sec) Fixes: 14329/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LSCR_fuzzer-5679252923482112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-04-13avcodec: add LSCR decoderPaul B Mahol
Fixes #4711.
2018-11-16avcodec/pngdec: Check compression methodMichael Niedermayer
method 0 (inflate/deflate) is the only specified in the specification and the only supported Fixes: Timeout Fixes: 10976/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PNG_fuzzer-5729372588736512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-06-17lavc/pngdec: Replace the number by macro for bprint initJun Zhao
Replace the number by macro for bprint init. Signed-off-by: Jun Zhao <mypopydev@gmail.com>
2017-11-11Merge commit '9f5b77c16f4da6248b57f0601364d9c762c620c2'James Almer
* commit '9f5b77c16f4da6248b57f0601364d9c762c620c2': png: Report more details regarding unsupported pixel formats Merged-by: James Almer <jamrial@gmail.com>
2017-11-09lavc/pngdec: fix av_bprint_finalize() usage.Nicolas George
2017-11-09pngdec: expose gAMA and cHRM chunks as side/meta dataRostislav Pehlivanov
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-11-09pngdec: check for bprint finalization sucess on icc data parsingRostislav Pehlivanov
It can fail in case of OOM. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-09-20avcodec/pngdec: Clean up on av_frame_ref() failureMichael Niedermayer
Fixes: memleak Fixes: 3203/clusterfuzz-testcase-minimized-4514553595428864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-22avcodec/pngdec: Fix () placementMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-21png: Report more details regarding unsupported pixel formatsLuca Barbato
2017-07-27pngdec: fix potential memory leakRostislav Pehlivanov
Fixes CID1412026. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-07-25pngdec: decode and expose iCCP chunks as side dataRostislav Pehlivanov
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-05-04avcodec/pngdec: Use ff_set_dimensions()Michael Niedermayer
Fixes OOM Fixes: 1314/clusterfuzz-testcase-minimized-4621997222920192 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-23avcodec: do not use AVFrame accessorMuhammad Faiz
Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-04-03png: set AVFrame flags/fields before calling setup_finished().Ronald S. Bultje
Fixes tsan warnings in fate-apng: WARNING: ThreadSanitizer: data race (pid=51230) Read of size 4 at 0x7d50000042fc by main thread (mutexes: write M1000): #0 frame_copy_props frame.c:302 (ffmpeg:x86_64+0x1019a35d6) [..] Previous write of size 4 at 0x7d50000042fc by thread T1 (mutexes: write M997): #0 decode_idat_chunk pngdec.c:708 (ffmpeg:x86_64+0x100f5562a)
2017-04-03png: split header state and data state in two separate variables.Ronald S. Bultje
Fixes a reported (but false) race condition in tsan for fate-apng: WARNING: ThreadSanitizer: data race (pid=6274) Read of size 4 at 0x7d680001ec78 by main thread (mutexes: write M1338): #0 update_thread_context src/libavcodec/pngdec.c:1456 (ffmpeg+0x000000dacf0c) [..] Previous write of size 4 at 0x7d680001ec78 by thread T1 (mutexes: write M1335): #0 decode_idat_chunk src/libavcodec/pngdec.c:737 (ffmpeg+0x000000dae951)
2017-03-29lavc: use av_fourcc2str() where appropriateClément Bœsch
2017-02-25avcodec/pngdec: Fix runtime error: left shift of 152 by 24 places cannot be ↵Michael Niedermayer
represented in type 'int' Fixes: 666/clusterfuzz-testcase-6581447227867136 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-19avcodec/pngdec: Check bit depth for validityMichael Niedermayer
Fixes: runtime error: shift exponent 132 is too large for 32-bit type 'int' Fixes: 609/clusterfuzz-testcase-4825202619842560 See 11.2.2 IHDR Image header Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-19avcodec/pngdec: Store metadata directly into AVFrameMichael Niedermayer
Fixes memleak Fixes: 500/clusterfuzz-testcase-6315221727576064 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-10avcodec: Mark some codecs with threadsafe init as suchDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2017-02-08avcodec: Mark some codecs with threadsafe init as suchDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-04avcodec/pngdec: Check trns more completelyMichael Niedermayer
Fixes out of array access Fixes: 546/clusterfuzz-testcase-4809433909559296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-23avcodec/pngdec: Fix off by 1 size in decode_zbuf()Michael Niedermayer
Fixes out of array access Fixes: 444/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_PNG_fuzzer Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-12-23Use correct printf conversion specifiers for POSIX integer typesDiego Biurrun
2016-11-28pngdec: check if previous frame exists instead of trusting sequence_numberAndreas Cadhalpun
This fixes a segmentation fault caused by calling memcpy with NULL as second argument in handle_p_frame_apng. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-11-18Revert "apngdec: use side data to pass extradata to the decoder"James Almer
This reverts commit e0c6b32046f4bab7d34be77dd2f03b2a80c86d39. Said commit changed the behavior of the demuxer and decoder in a non backwards compatible way. Demuxers should make extradata available at init if possible, and send new extradata as side data within a packet if needed. A better fix for the remuxing crash will follow. Signed-off-by: James Almer <jamrial@gmail.com>
2016-11-01apngdec: use side data to pass extradata to the decoderAndreas Cadhalpun
Fixes remuxing apng streams coming from the apng demuxer. This is a regression since 940b8908b94404a65f9f55e33efb4ccc6c81383c. Found-by: James Almer <jamrial@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-04-09avcodec/pngdec: Fix alpha detection with skip_frameMichael Niedermayer
Fixes Ticket4816 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-30avcodec/pngdec: use av_mod_uintp2James Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2015-11-16avcodec/pngdec: Replace assert by request for sample for unsupported TRNS casesMichael Niedermayer
Fixes assertion failure Fixes: 7f646252a30ee28b583aac1f82e7985e/signal_sigabrt_7ffff6ae7cc9_7353_62fc077bf2f454d39e188c69807193a6.png Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-15lavc/pngdec: set FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM capabilityMatthieu Bouron
2015-11-07apng: use correct size for output bufferAndreas Cadhalpun
The buffer needs s->bpp bytes, at maximum currently 10. Assert that s->bpp is not larger. This fixes a stack buffer overflow. Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-11-02Merge commit '1720791e36f9cc24c05efea5bb275ab52156ce50'Hendrik Leppkes
* commit '1720791e36f9cc24c05efea5bb275ab52156ce50': png: read and write stereo3d frame side data information Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-30png: read and write stereo3d frame side data informationKirill Gavrilov
Use optional sTER chunk defining side-by-side stereo pair within "Extensions to the PNG 1.2 Specification", version 1.3.0. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-29lavc/pngdec: honor skip_frame optionMatthieu Bouron
2015-10-28avcodec/png: read and write stereo3d frame side data informationKirill Gavrilov
Use optional sTER chunk defining side-by-side stereo pair within "Extensions to the PNG 1.2 Specification", version 1.3.0. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-11avcodec/pngdec: Use av_malloc_array()Michael Niedermayer
Suggested-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-11avcodec/pngdec: Alloc buffer after blend_op check in handle_p_frame_apng()Michael Niedermayer
Avoids memleak on error Fixes CID1322342 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-11avcodec/pngdec: Check blend_op.Michael Niedermayer
Fixes CID1322359, CID1322358 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-04avcodec: use HAVE_THREADS header guards to silence -Wunused-functionGanesh Ajjanagadde
When compiled with --disable-pthreads, e.g http://fate.ffmpeg.org/report.cgi?time=20150917015044&slot=alpha-debian-qemu-gcc-4.7, a bunch of -Wunused-functions are reported due to missing header guards around threading related functions. This patch should silence such warnings. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-01avcodec/pngdec: mark previous_picture as done on end of decode_frame_common()Michael Niedermayer
Fixes deadlock with threads Found-by: Paul B Mahol Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-28avcodec/pngdec: reset has_trns after every decode_frame_png()Paul B Mahol
Fixes #4887. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-08-31avcodec/pngdec: fully support the tRNS chunkDonny Yang
Signed-off-by: Donny Yang <work@kota.moe>
2015-08-05Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'Hendrik Leppkes
* commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb': png: Be more informative regarding signature errors Conflicts: libavcodec/pngdec.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>