• S
    sha1_file: Fix infinite loop when pack is corrupted · b3118bdc
    Shawn O. Pearce 提交于
    Some types of corruption to a pack may confuse the deflate stream
    which stores an object.  In Andy's reported case a 36 byte region
    of the pack was overwritten, leading to what appeared to be a valid
    deflate stream that was trying to produce a result larger than our
    allocated output buffer could accept.
    
    Z_BUF_ERROR is returned from inflate() if either the input buffer
    needs more input bytes, or the output buffer has run out of space.
    Previously we only considered the former case, as it meant we needed
    to move the stream's input buffer to the next window in the pack.
    
    We now abort the loop if inflate() returns Z_BUF_ERROR without
    consuming the entire input buffer it was given, or has filled
    the entire output buffer but has not yet returned Z_STREAM_END.
    Either state is a clear indicator that this loop is not working
    as expected, and should not continue.
    
    This problem cannot occur with loose objects as we open the entire
    loose object as a single buffer and treat Z_BUF_ERROR as an error.
    Reported-by: NAndy Isaacson <adi@hexapodia.org>
    Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
    Acked-by: NNicolas Pitre <nico@fluxnic.net>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    b3118bdc
sha1_file.c 65.1 KB