[FFmpeg-devel,0/3] avcodec/aacdec_template: improvements to 22.2 layout logic

Message ID 20200818192538.35023-1-jeebjp@gmail.com
Headers show


Jan Ekström Aug. 18, 2020, 7:25 p.m. UTC
The first two commits fix both of the fuzzing samples I have on hand.
One being from #8845, and another provided privately by Michael. Changes have
been tested both with clang 10's ASAN as well as standard valgrind.

The latter 22.2 check could be simplified to just the layout (since if the
stream passes all checks to that point, it probably is 22.2), but I
decided to post the first version this way to show that I haven't just
been sitting on my backside.

The last commit is general debug logging that I found helpful during
adding support of 22.2 by logging the element order before/after reorder.
This one, if found non-interesting, can just be ignored. I decided to
post it as it was part of my verification.

Jan Ekström (3):
  avcodec/aacdec_template: keep tabs on layout in sniff_channel_order
  avcodec/aacdec_template: add more checks to make sure only 22.2 gets
    to 22.2
  avcodec/aacdec_template: log the element order before/after reordering

 libavcodec/aacdec_template.c | 119 ++++++++++++++++++++++++++++-------
 1 file changed, 96 insertions(+), 23 deletions(-)