From patchwork Sat Sep 26 10:27:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22602 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 A945F44A10F for ; Sat, 26 Sep 2020 13:30:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94A6468B6BF; Sat, 26 Sep 2020 13:30:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A7E468B629 for ; Sat, 26 Sep 2020 13:29:57 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id q9so1720152wmj.2 for ; Sat, 26 Sep 2020 03:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0rX9LFhMdqL15kYIN/NZgOFNmajDZeC8MsUbOpHJI30=; b=izohGwS+ayQiwGBx2GVUOP9amXp5dFuvsn4PR9mZIDGieeDONGsMhaUcpQ8Cz4BE8v 4qYU6mXE6rst1yPj52N/XuZTEDwFYqpeX5fkFpKAhGVHWoiH0Ejfmg96MXnY/VN0AQ1s 5jsk9/j6L9AyJMS8QeNicYJuI7VxHPurXxt0AQvrvTZO1B0QFfcnf9Z49yJicyxUwN+n 9vAhp3EPVRBEsUixNI1QUKSQJ7MLIqSjf6xmpUwzoghegtO3/LQIBnBoVIWV/d0v4xO2 gzKMEc4usuXXeonaLOH6vBXwys6g+hWOylLPLew85wxqR9ErTqij75QyEFd6SccSxrQD I6hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0rX9LFhMdqL15kYIN/NZgOFNmajDZeC8MsUbOpHJI30=; b=TYYPnpCR2WBKkHGEpWTmt+RxX/dwqb39hyZmmKxj2BhiNcQZMDsL3XKzjSXSOrUj/P xBiWwrLtcPKkwfN+nrbslyefhmFTNF09cPrWxL4g+9Hrjfj8ayI0Z/8Z25u2D16FUtMr TMOf7Nk26l6zC9odpFZnzBZVcStzGiVZAILeZh0zgWVWJdtJYn4J2bJB4SmEIw5tZwgf Za5C7p50XuJ17UC3A9OitwwJHuIE7BTuuCZ3L7Dg4DIz/gG9UHXf6QIUAY5bPHoZ2pfZ Ay7ekaNFHU6piwr0XtP3R02zhMVo9XGbWunqVYAFbzgyBblZGW5vmv7RLAgx4yd1jpcj Bqnw== X-Gm-Message-State: AOAM531bKQucG/eBleTLND/OCziKBCxDxLffn/ohwp6514LU0H+8Zu31 23/gUUCW6gX9VJSSeZ6dAGm/A/wGlQs= X-Google-Smtp-Source: ABdhPJxJuL9J1p2274FW+XfhzkP7MJre7G8K/bxjDLwb4nrZ/O14nP6oRH76RNUbNsHeRh1c3iI8aQ== X-Received: by 2002:a1c:3d44:: with SMTP id k65mr1987909wma.132.1601116196493; Sat, 26 Sep 2020 03:29:56 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k8sm6064867wrl.42.2020.09.26.03.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 03:29:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Sep 2020 12:27:44 +0200 Message-Id: <20200926102804.228089-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200926102804.228089-1-andreas.rheinhardt@gmail.com> References: <20200926102804.228089-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/25] avcodec/magicyuv: Check early for invalid slices 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Every plane of each slice has to contain at least two bytes for flags and the type of prediction used. Signed-off-by: Andreas Rheinhardt --- libavcodec/magicyuv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index d2f6a9b01e..6c29efc9f4 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -614,6 +614,8 @@ static int magy_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; s->slices[i][j].size = next_offset - offset; + if (s->slices[i][j].size < 2) + return AVERROR_INVALIDDATA; offset = next_offset; }