Browse Source

lagarith: check count before writing zeros.

Fixes CVE-2012-2793

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit b631e4ed64)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
tags/n0.8.13
Michael Niedermayer Reinhard Tartler 14 years ago
parent
commit
44da556815
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavcodec/lagarith.c

+ 5
- 0
libavcodec/lagarith.c View File

@@ -322,6 +322,11 @@ static int lag_decode_zero_run_line(LagarithContext *l, uint8_t *dst,
output_zeros:
if (l->zeros_rem) {
count = FFMIN(l->zeros_rem, width - i);
if (end - dst < count) {
av_log(l->avctx, AV_LOG_ERROR, "Too many zeros remaining.\n");
return AVERROR_INVALIDDATA;
}

memset(dst, 0, count);
l->zeros_rem -= count;
dst += count;


Loading…
Cancel
Save