• Andreas Rheinhardt's avatar
    avformat/flac_picture: Simplify checks · 35005a4a
    Andreas Rheinhardt authored
    During parsing a flac picture metadata block, the mimetype is read as
    follows: Its 32b size field is read and checked for being in the range
    1..63; afterwards, the actual mimetype-string is read into a buffer of
    size 64, where the length to read is the minimum of the length field and
    the size of the destination buffer -1. Then an assert guards that length
    is indeed < the size of the destination buffer before the string in the
    buffer is zero-terminated.
    
    The FFMIN as well as the assert are actually redundant, as it has
    been checked that the string (even after terminating) fits into the
    buffer. In order to make this clear, reword the check "len >= 64" to
    "len >= sizeof(mimetype)" and drop the FFMIN as well as the assert.
    Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
    Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
    35005a4a
Name
Last commit
Last update
compat Loading commit data...
doc Loading commit data...
ffbuild Loading commit data...
fftools Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.travis.yml Loading commit data...
CONTRIBUTING.md Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
INSTALL.md Loading commit data...
LICENSE.md Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README.md Loading commit data...
RELEASE Loading commit data...
configure Loading commit data...