From patchwork Tue Sep 15 07:39:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22396 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 8F52344B636 for ; Tue, 15 Sep 2020 10:40:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D0B168BC5D; Tue, 15 Sep 2020 10:40:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AF9268BB73 for ; Tue, 15 Sep 2020 10:40:42 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id o5so2102470wrn.13 for ; Tue, 15 Sep 2020 00:40:42 -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=Oy7fES90AVjV1vutYJtBNLk1/Y4oOiulI+QVPssEcNM=; b=BwsdfbrnX/ZY62t5VugKfAzWNRlJLRCzl09oa8DwuHRwXGM+TskUX4M5BZxGfTcXkf E9qqgEZrmPYkURvW1FujBIYFraQHiEXkzpCyENGOm0mPoUpOkX2sUPY7tI2dztM0dLEC q/ZO++IXWLz6WTsdevlcIHvxj+vlWjc08oPEQdHghviie4NiYDB/RTAgMlp6+KU7bXsd cNU7Fr1quekxLFqqroKg4hCvbxFZk/3TmDa937OrYlk9SXJee1rawXAI3mq+dzZJVs9h ZUgBVrsxIxbF3PK4SlqGdS1qR/AZmzZZ3kcZaAiMT8jGmyJ8HQlVelJ134HuwJb8SgtP NuuQ== 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=Oy7fES90AVjV1vutYJtBNLk1/Y4oOiulI+QVPssEcNM=; b=DGRq+x31VN9CVE+l/1GqB+DIGor1phn6mqT/PUGWsv0/GBmS94fecbcUnt3hEgMRCW wLd5nibcLofAwNiIj2CMoUNTABpRoyU85AMcOmHJS2eTHnScb529Vr8hC6EG99LUFw8m MsQK9WPuP2pbOv/AkubsrM56OOWZYIhyUZaPIBw60jcRN8trgSGSMLdiEsTL3DWVVPfq 86HSiwzSgQwbg/RIl6JrRxP9U2zIZgXcA9aPB7JQoS99Xm3V661MqlzfrLw6F7NVgpeM FO3I3aWBIk/fuVbNeF5vyANCyHWPdYghYFdEEdLIG7ZNieK7bSZVeplqXAPZK7LrgseC f97Q== X-Gm-Message-State: AOAM533zGTawN0jxS/5tHgYD7eYGXEEKdIbe24rCELZiT4I7jY2sx77F 8TbNRzuVdQtJkwCnzK+6UGtL7rRSH24= X-Google-Smtp-Source: ABdhPJyBZZMDJ21kCTDHtV8lJVJFiHwE4vBpLdkRLuWa6WUs+gLykDnpfsPE8iIpDt4zPSzGIgYBYQ== X-Received: by 2002:adf:fc0a:: with SMTP id i10mr19531159wrr.111.1600155641217; Tue, 15 Sep 2020 00:40:41 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:45 +0200 Message-Id: <20200915074000.102622-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/30] avcodec/ivi: Fix segfault on allocation error 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" If allocating the tiles array for indeo 4/5 fails, the context is in an inconsistent state, because the counter for the number of tiles is > 0. This will lead to a segfault when freeing the tiles' substructures. Fix this by setting the number of tiles to zero if the allocation was unsuccessfull. Signed-off-by: Andreas Rheinhardt --- libavcodec/ivi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index c5c50fb5c1..c10984e83e 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -442,8 +442,10 @@ av_cold int ff_ivi_init_tiles(IVIPlaneDesc *planes, av_freep(&band->tiles); band->tiles = av_mallocz_array(band->num_tiles, sizeof(IVITile)); - if (!band->tiles) + if (!band->tiles) { + band->num_tiles = 0; return AVERROR(ENOMEM); + } /* use the first luma band as reference for motion vectors * and quant */