• 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
flac_picture.c 4.63 KB