• Aidan MacDonald's avatar
    avcodec/dvdsub_parser: Fix length check for short packets · a4405cc0
    Aidan MacDonald authored
    The DVD subtitle parser handles two types of packets: "normal"
    packets with a 16-bit length, and HD-DVD packets that set the
    16-bit length to 0 and encode a 32-bit length in the next four
    bytes. This implies that HD-DVD packets are at least six bytes
    long, but the code didn't actually verify this.
    
    The faulty length check results in an out of bounds read for
    zero-length "normal" packets that occur in the input, which are
    only 2 bytes long, but get misinterpreted as an HD-DVD packet.
    When this happens the parser reads packet_len from beyond the
    end of the input buffer. The subtitle stream is not correctly
    decoded after this point due to the garbage packet_len.
    
    Fixing this is pretty simple: fix the length check so packets
    less than 6 bytes long will not be mistakenly parsed as HD-DVD
    packets.
    Signed-off-by: 's avatarAidan MacDonald <aidanmacdonald.0x0@gmail.com>
    Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
    a4405cc0
dvdsub_parser.c 3.01 KB