From patchwork Thu Sep 3 17:03:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22078 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E227844AD5C for ; Thu, 3 Sep 2020 20:08:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B607368AB82; Thu, 3 Sep 2020 20:08:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACB746883C5 for ; Thu, 3 Sep 2020 20:08:39 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id a65so3605075wme.5 for ; Thu, 03 Sep 2020 10:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=G83xC3zlU3DIr7p+w+gtIpBDWPoVt52ho0bonCzGuKE=; b=NE4vvuyz28IN5VANHtIxk6ZZdd4LfQDuPBil+b90fQAeWEh+lUeie3ml0v8aIYeGRA gNEUhQdcNfefMS38E5aAcs9LxpUbL4Kj7pHhDFoZ+KfxyN6Ey137y9CvlONlaPOo/VrN XpF3dPFisnAxxd2ct0xQNdPbVp4t6o8/avCCd1OeDMlDoOdCH8Jqt0fsDSywsve7Xcuc 8D5jDlY/kQ2QmPKRmVQt6QGGzNk1JeBA409owVtEDNDbvHaNYi0PBUqI6MYgBAGwgaxc Ew6fC81DBflg7s7K0Z20GUZvkX4+1v03i/YgxuOiEFtRhv6QeeQ9uuamB1qQ+X6p+dxc E+6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=G83xC3zlU3DIr7p+w+gtIpBDWPoVt52ho0bonCzGuKE=; b=HfwLZ5kIMQ6wGlwcro806cqC9C5rgAhAPW1SGbgj0Zi77rPzAoGJ3AeZ8+mfFqBarD 47b2HVwQ0vY6S6wlPfZB9V1yelIO89cc4pU9q5AZ54xEy2+iKT2fHXKr+6PnC43HA1Rt DPRSRy52jPwfGlVvYHRkkGXXUDuboFKJV0XQECg37H0XZiFqmqtHPSrkp3GZoMdT3k73 yXpjlD/jy+YgVSiMAI2dhjHUf21nwBa8jBcy2XTdFV9Vpt30KDgBwai/2BA2g81XKOfe vk4NmJlhGeomcNLlFMVHqlN4BxeSAQnk+EdumgWQ1asVk5b0savjdiElmDgybGE3wHZb +BRQ== X-Gm-Message-State: AOAM53167RDQkV8TLs4lrbZjdjlJdGW1Gst/T3Vj27vSVPQ3B+rCKcLH dEWlYHEwyTsPWMJijkjm6VMNr0hat28JkA== X-Google-Smtp-Source: ABdhPJzdXfymIh5KEviFVayrxgEd58JUje+idqTohrjkn+yOKq4hQVkRnJLvkUv36VoQb9iQ4Mmb/g== X-Received: by 2002:a1c:3d44:: with SMTP id k65mr3302114wma.132.1599152612529; Thu, 03 Sep 2020 10:03:32 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id w21sm5388645wmk.34.2020.09.03.10.03.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 10:03:31 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Sep 2020 19:03:23 +0200 Message-Id: <20200903170323.23006-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/dxtory: unbreak decoding after 6e1a167c556 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" get_unary() takes at minimum only 1 bit. Signed-off-by: Paul B Mahol --- As this is important fix, will apply in next 5 minutes. I kindly ask authors of various timeouts changes to kindly test their changes more carefully. --- libavcodec/dxtory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index bc19f27951..3cd95afe80 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -395,7 +395,7 @@ static int dx2_decode_slice_5x5(GetBitContext *gb, AVFrame *frame, int stride = frame->linesize[0]; uint8_t *dst = frame->data[0] + stride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { b = decode_sym_565(gb, lru[0], 5); g = decode_sym_565(gb, lru[1], is_565 ? 6 : 5); @@ -462,7 +462,7 @@ static int dx2_decode_slice_rgb(GetBitContext *gb, AVFrame *frame, int stride = frame->linesize[0]; uint8_t *dst = frame->data[0] + stride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { dst[x * 3 + 0] = decode_sym(gb, lru[0]); dst[x * 3 + 1] = decode_sym(gb, lru[1]); @@ -508,7 +508,7 @@ static int dx2_decode_slice_410(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + (ustride >> 2) * line; uint8_t *V = frame->data[2] + (vstride >> 2) * line; - for (y = 0; y < left - 3 && get_bits_left(gb) > 9 * width; y += 4) { + for (y = 0; y < left - 3 && get_bits_left(gb) >= 4 * width; y += 4) { for (x = 0; x < width; x += 4) { for (j = 0; j < 4; j++) for (i = 0; i < 4; i++) @@ -553,7 +553,7 @@ static int dx2_decode_slice_420(GetBitContext *gb, AVFrame *frame, uint8_t *V = frame->data[2] + (vstride >> 1) * line; - for (y = 0; y < left - 1 && get_bits_left(gb) > 6 * width; y += 2) { + for (y = 0; y < left - 1 && get_bits_left(gb) >= 3 * width; y += 2) { for (x = 0; x < width; x += 2) { Y[x + 0 + 0 * ystride] = decode_sym(gb, lru[0]); Y[x + 1 + 0 * ystride] = decode_sym(gb, lru[0]); @@ -597,7 +597,7 @@ static int dx2_decode_slice_444(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + ustride * line; uint8_t *V = frame->data[2] + vstride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { Y[x] = decode_sym(gb, lru[0]); U[x] = decode_sym(gb, lru[1]) ^ 0x80;