Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
base: 301f6da0397e
Choose a base ref
...
head repository: FFmpeg/FFmpeg
compare: f51c4bfe3f34
Choose a head ref
  • 18 commits
  • 10 files changed
  • 4 contributors

Commits on Sep 29, 2012

  1. indeo3: fix out of cell write.

    Fixes CVE-2012-2776.
    
    CC:libav-stable@libav.org
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    elenril committed Sep 29, 2012
    Copy the full SHA
    e4d4044 View commit details
    Browse the repository at this point in the history
  2. indeo5: check tile size in decode_mb_info().

    This prevents writing into a too small array if some parameters changed
    without the tile being reallocated.
    
    Fixes CVE-2012-2794
    
    CC:libav-stable@libav.org
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    Signed-off-by: Anton Khirnov <anton@khirnov.net>
    michaelni authored and elenril committed Sep 29, 2012
    Copy the full SHA
    2d09cdb View commit details
    Browse the repository at this point in the history
  3. ivi_common: make ff_ivi_process_empty_tile() static.

    It's not used outside of ivi_common.c
    elenril committed Sep 29, 2012
    Copy the full SHA
    5d2170c View commit details
    Browse the repository at this point in the history
  4. indeo4/5: check empty tile size in decode_mb_info().

    This prevents writing into a too small array if some parameters changed
    without the tile being reallocated.
    
    Based on a patch by Michael Niedermayer <michaelni@gmx.at>
    
    Fixes CVE-2012-2800
    
    CC:libav-stable@libav.org
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    elenril committed Sep 29, 2012
    Copy the full SHA
    ae3da0a View commit details
    Browse the repository at this point in the history
  5. wmalosslessdec: make MCLMS arrays big enough for what is written into…

    … them.
    
    Fixes a part of CVE-2012-2795
    
    CC:libav-stable@libav.org
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    Signed-off-by: Anton Khirnov <anton@khirnov.net>
    michaelni authored and elenril committed Sep 29, 2012
    Copy the full SHA
    607f571 View commit details
    Browse the repository at this point in the history
  6. wmalosslessdec: fix a get_bits(0) in decode_ac_filter

    Fixes a part of CVE-2012-2795
    
    CC:libav-stable@libav.org
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    Signed-off-by: Anton Khirnov <anton@khirnov.net>
    michaelni authored and elenril committed Sep 29, 2012
    Copy the full SHA
    f48fbf2 View commit details
    Browse the repository at this point in the history
  7. wmalosslessdec: Fix reading too many bits in decode_channel_residues()

    Fixes a part of CVE-2012-2795
    
    CC:libav-stable@libav.org
    
    Based on a patch by Michael Niedermayer <michaelni@gmx.at>
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    elenril committed Sep 29, 2012
    Copy the full SHA
    6a99310 View commit details
    Browse the repository at this point in the history
  8. dfa: improve boundary checks in decode_dds1()

    Fixes CVE-2012-2798
    
    CC:libav-stable@libav.org
    elenril committed Sep 29, 2012
    Copy the full SHA
    d05f72c View commit details
    Browse the repository at this point in the history
  9. wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.

    Fixes CVE-2012-2799
    
    CC:libav-stable@libav.org
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    Signed-off-by: Anton Khirnov <anton@khirnov.net>
    michaelni authored and elenril committed Sep 29, 2012
    Copy the full SHA
    d65d834 View commit details
    Browse the repository at this point in the history
  10. avsdec: Set dimensions instead of relying on the demuxer.

    The decode function assumes that the video will have those dimensions.
    
    Fixes CVE-2012-2801
    
    CC:libav-stable@libav.org
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    Signed-off-by: Anton Khirnov <anton@khirnov.net>
    michaelni authored and elenril committed Sep 29, 2012
    Copy the full SHA
    85f4779 View commit details
    Browse the repository at this point in the history
  11. mpeg12: move mpeg_decode_frame() lower

    Avoids a forward declaration of decode_chunks().
    elenril committed Sep 29, 2012
    Copy the full SHA
    d9a2e87 View commit details
    Browse the repository at this point in the history
  12. mpeg12: fix the semantics of the int* parameter of decode()

    It is got_output, not data_size.
    elenril committed Sep 29, 2012
    Copy the full SHA
    0f583d2 View commit details
    Browse the repository at this point in the history
  13. h264: avoid stuck buffer pointer in decode_nal_units

    When decode_nal_units() previously encountered a NAL_END_SEQUENCE,
    and there are some junk bytes left in the input buffer, but no start codes,
    buf_index gets stuck 3 bytes before the end of the buffer.
    
    This can trigger an infinite loop in the caller code, eg. in
    try_decode_trame(), as avcodec_decode_video() then keeps returning zeroes,
    with 3 bytes of the input packet still available.
    
    With this change, the remaining bytes are skipped so the whole packet gets
    consumed.
    
    CC:libav-stable@libav.org
    
    Signed-off-by: Jindřich Makovička <makovick@gmail.com>
    Signed-off-by: Anton Khirnov <anton@khirnov.net>
    jmakovicka authored and elenril committed Sep 29, 2012
    Copy the full SHA
    1a8c691 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2012

  1. Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'

    * commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6':
      dfa: improve boundary checks in decode_dds1()
      wmalosslessdec: Fix reading too many bits in decode_channel_residues()
      wmalosslessdec: fix a get_bits(0) in decode_ac_filter
      wmalosslessdec: make MCLMS arrays big enough for what is written into them.
      indeo4/5: check empty tile size in decode_mb_info().
      ivi_common: make ff_ivi_process_empty_tile() static.
      indeo5: check tile size in decode_mb_info().
      indeo3: fix out of cell write.
    
    Conflicts:
    	libavcodec/dfa.c
    	libavcodec/indeo3.c
    	libavcodec/indeo5.c
    	libavcodec/ivi_common.c
    	libavcodec/wmalosslessdec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 30, 2012
    Copy the full SHA
    e5ce6d4 View commit details
    Browse the repository at this point in the history
  2. Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'

    * commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23':
      mpeg12: move mpeg_decode_frame() lower
      avsdec: Set dimensions instead of relying on the demuxer.
      wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.
    
    Conflicts:
    	libavcodec/avs.c
    	libavcodec/mpeg12.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 30, 2012
    Copy the full SHA
    853a938 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'qatar/master'

    * qatar/master:
      h264: avoid stuck buffer pointer in decode_nal_units
      mpeg12: fix the semantics of the int* parameter of decode()
    
    Conflicts:
    	libavcodec/mpeg12.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 30, 2012
    Copy the full SHA
    20bd921 View commit details
    Browse the repository at this point in the history
  4. ffmpeg: disable buffering for stderr, needed for win32 runtime

    Found in http://www.makemkv.com/download/ffmpeg/mmffmpeg-1.7.7.patch.gz
    
    Commit message by commiter
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    The makemkv authors authored and michaelni committed Sep 30, 2012
    Copy the full SHA
    89a823a View commit details
    Browse the repository at this point in the history
  5. bitstream: add get_bits_longlong() to support more than 32bits

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 30, 2012
    Copy the full SHA
    f51c4bf View commit details
    Browse the repository at this point in the history