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
path: root/libavcodec/smacker.c
AgeCommit message (Collapse)Author
2017-11-12Merge commit '0ccddbad200c1d9439c5a836501917d515cddf76'James Almer
* commit '0ccddbad200c1d9439c5a836501917d515cddf76': smacker: limit recursion depth of smacker_decode_bigtree See 946ecd19ea752399bccc751c9339ff74b815587e Merged-by: James Almer <jamrial@gmail.com>
2017-11-12Merge commit 'cd4663dc80323ba64989d0c103d51ad3ee0e9c2f'James Almer
* commit 'cd4663dc80323ba64989d0c103d51ad3ee0e9c2f': smacker: add sanity check for length in smacker_decode_tree() See b829da363985cb2f80130bba304cc29a632f6446 Merged-by: James Almer <jamrial@gmail.com>
2017-11-11smacker: limit recursion depth of smacker_decode_bigtreeAndreas Cadhalpun
This fixes segmentation faults due to stack-overflow caused by too deep recursion. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Sean McGovern <gseanmcg@gmail.com>
2017-11-11smacker: add sanity check for length in smacker_decode_tree()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Bug-Id: 1098 Cc: libav-stable@libav.org Signed-off-by: Sean McGovern <gseanmcg@gmail.com>
2017-11-01Merge commit '5edded9df31bc4712a023f89941b4c278f1bd6f5'James Almer
* commit '5edded9df31bc4712a023f89941b4c278f1bd6f5': smacker: Improve error handling See c1947015b2eec65c7fbd702e1d8c22248be511e8 Merged-by: James Almer <jamrial@gmail.com>
2017-11-01Merge commit 'b98f082d8ddc0a0d8317114d8414ab51de60ef02'James Almer
* commit 'b98f082d8ddc0a0d8317114d8414ab51de60ef02': smacker: Check that the data size is a multiple of a sample vector See 4a9af07a49295e014b059c1ab624c40345af5892 Merged-by: James Almer <jamrial@gmail.com>
2017-06-01smacker: Improve error handlingDiego Biurrun
Return sensible error values and forward error codes.
2017-06-01smacker: Check that the data size is a multiple of a sample vectorMichael Niedermayer
Fixes out of array access Fixes: ce19e41f0ef1e52a23edc488faecdb58/asan_heap-oob_2504e97_4202_ffa0df1baed14022b9bfd4f8ac23d0cb.smk Bug-Id: CVE-2015-8365 CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4a9af07a49295e014b059c1ab624c40345af5892) Signed-off-by: Diego Biurrun <diego@biurrun.de>
2017-05-02vlc: Add header #include when the types are usedLuca Barbato
Do not rely on indirectly including it from bitstream.h. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2017-02-07Use bitstream_init8() where appropriateDiego Biurrun
2016-11-24smacker: Convert to the new bitstream readerAlexandra Hájková
2016-11-23smacker: limit recursion depth of smacker_decode_bigtreeAndreas Cadhalpun
This fixes segmentation faults due to stack-overflow caused by too deep recursion. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-06-29Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'Clément Bœsch
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40': get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes The merge commit also includes changes for libavcodec/interplayacm.c and libavcodec/truemotion2rt.c Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-07get_bits: Move BITSTREAM_READER_LE definition before all relevant #includesDiego Biurrun
This avoids the danger that get_bits.h might get indirectly #included before BITSTREAM_READER_LE is defined. Also sort headers into canonical order where appropriate.
2016-02-24Merge commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab'Derek Buitenhuis
* commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab': cosmetics: Drop particularly redundant silly comments Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-18cosmetics: Drop particularly redundant silly commentsDiego Biurrun
2015-11-15avcodec/smacker: Check that the data size is a multiple of a sample vectorMichael Niedermayer
Fixes out of array access Fixes: ce19e41f0ef1e52a23edc488faecdb58/asan_heap-oob_2504e97_4202_ffa0df1baed14022b9bfd4f8ac23d0cb.smk Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-04avcodec/smacker: Check init_get_bits8() for failureMichael Niedermayer
Fixes: CID1322314 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-11-23lavc/smacker: fix mem leak in case of init failureLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-07-18smacker: remove dead codeTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18avcodec/smacker: use av_mallocz_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-20avformat/smacker: check for format mismatch more completelyMichael Niedermayer
Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f6e83322950_9769_wetlogo.smk Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17Merge commit 'a837c4f2df96a30bf9aa4115b426d608487c7101'Michael Niedermayer
* commit 'a837c4f2df96a30bf9aa4115b426d608487c7101': zmbvenc: use the AVFrame API properly. flicvideo: use the AVFrame API properly. smacker: use the AVFrame API properly. mmvideo: use the AVFrame API properly. Conflicts: libavcodec/flicvideo.c libavcodec/mmvideo.c libavcodec/smacker.c libavcodec/zmbvenc.c See: 76e27b1d0594199b4b1ff8520312069f42373944 See: 099e57bc38d7e53cf6823dfec349ff9fdaee99ba Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16smacker: use the AVFrame API properly.Anton Khirnov
2013-10-04Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun
2013-09-12avcodec/smacker: use init_get_bits8()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-12avcodec/smacker: fix some memleaksMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12avcodec/smacker: remove check that has become redundantMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12avcodec/smacker: use the correct field instead of a hardcoded value for the ↵Michael Niedermayer
index check in smacker_decode_tree() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'Michael Niedermayer
* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd': smacker: Free memory properly if the init function fails Conflicts: libavcodec/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'Michael Niedermayer
* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da': smacker: Make sure we don't fill in huffman codes out of range Conflicts: libavcodec/smacker.c See: 1285baaab550e3e761590ef6dfb1d9bd9d1332e4 the added test is redundant but will be used after future refactoring Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'Michael Niedermayer
* commit 'd002fce24a7206e95f9492031f45adc35711e183': smacker: Check malloc return values Conflicts: libavcodec/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11smacker: Free memory properly if the init function failsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11smacker: Make sure we don't fill in huffman codes out of rangeMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-11smacker: Check malloc return valuesMartin Storsjö
Also try to free local allocations on errors. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-01smacker: make code independent of sizeof(AVFrame)Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-29Avoid a null pointer dereference on oom when decoding smacker.Carl Eugen Hoyos
Fixes ticket #2728.
2013-06-29Propagate error return values from the smacker decoder.Carl Eugen Hoyos
2013-06-17Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'Michael Niedermayer
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c': smacker: check the return value of smacker_decode_tree Conflicts: libavcodec/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-17Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'Michael Niedermayer
* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6': smacker: fix an off by one in huff.length computation Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-16smacker: check the return value of smacker_decode_treeKostya Shishkov
Also prevent a memory leak. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-16smacker: fix an off by one in huff.length computationKostya Shishkov
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-05-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: smacker: add a clarification notice about audio decoding configure: make jack depend on pthreads Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'Michael Niedermayer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28smacker: add a clarification notice about audio decodingKostya Shishkov
2013-05-27Revert "smackaud: clip output samples"Kostya Shishkov
Smacker audio uses overflows instead of clipping. This reverts commit 375ca0aca81be2951d9ba4731196e70e490d3cdf.
2013-05-20smacker: remove av_clip_int16()Michael Niedermayer
Fixes Ticket2425 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 17:28:15 +0300