From patchwork Sat Jan 23 20:48:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25131 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 2CF2244B48E for ; Sat, 23 Jan 2021 22:48:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C354689E7D; Sat, 23 Jan 2021 22:48:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9824B689C76 for ; Sat, 23 Jan 2021 22:48:34 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id 6so8444064wri.3 for ; Sat, 23 Jan 2021 12:48:34 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=Pfnc8GJk/Ulq6AHlqiFWzQln0LRA31QFKefu14w+Ndc=; b=FrrYGhWkfV2Hfdj/nkAKAZl68vgjJfcL1fptnullAtrHNNYKCsFhCL85u/YdQ7iYjq 0s/nsz/fREBq6WX2c4XCFVdRfGP5xkMPBc7VvUHAompyRVgILrwT7kTqjr0iqLNbwmsK Bc6MtFv0d/Wh2SKuCWVEnVvprtLm7Tm7DVWOvBX8fCVvm+p67/6XDaNHFi0xt25vyL4+ dbYoe4SwFqTvNfjbjNw2pgMqk3kEHjT+G6JYczPm69Bcx7CgLyo/rInXFan0m/y7dEeH KsrJT+MqFQwpeqQiP6ZR9w8Q+6uaCpBHtndPddeT3afwZ85CKqBj7nmDfLVgwhiUevcy i/6w== 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:reply-to:mime-version:content-transfer-encoding; bh=Pfnc8GJk/Ulq6AHlqiFWzQln0LRA31QFKefu14w+Ndc=; b=Afu2+nCWl4Bu59PnxbePIcqEFn9rxXtNhGzbFWEldSIDaworPh3vCSRLKuTREPaSRD T+StEJ0frXhsEtauXImPE+JDWa2KfJX/5Bo1LjYI6Hz5cPBJiWv0WEVSyNDnyNh/hsVU cxMRAaDAhQz3yIWduM0DVyxxpiMW/gpfvkRoXrzPN5/o1EHi6HFwdlepKy/MlDqHebu/ xsANcsFyeR8KiZVjx/8+RqQ0govMtn6dii7Gt826CtU3O1soxslV9Zk8SJ8vnbw1z4Mb cC2l3b8d4MQmErvjP66SCUv24HHSsmisX38VlAcPXCunSCIsn3Sp6Cz+94VMZA2MswW4 WRIQ== X-Gm-Message-State: AOAM530ju8x07CxizpW9xqauUJ3WJrwaYHIs1B1YNYuunEKl3PtXajuf 0JQxz7koAhvceSirc4/VQqnGt7Qrnto= X-Google-Smtp-Source: ABdhPJxTpvENCf7FOEKdA3UyCU4RML48cLbNmqgF+Llf3/4+idbZDaBsQCap2Y4p4m3FuecE/kYUJg== X-Received: by 2002:adf:e80f:: with SMTP id o15mr732996wrm.366.1611434913983; Sat, 23 Jan 2021 12:48:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:48:00 +0100 Message-Id: <20210123204800.689497-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/10] Revert "mpeg4videodec: raise an error if sprite_trajectory.table is NULL" 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" This reverts commit 6ac0e7818399a57e4684202bac79f35b3561ad1e. The mpeg4video parser can reach code that presumes that a certain VLC has been initialized; yet Libav did not ensure this and Libav bug #1012 [1] is about an ensuing crash. Instead of fixing the root cause a simple check for whether said VLC has already been initialized was added; said check is inherently racy. The proper fix is of course to ensure that the VLC is initialized and commit 7c76eaeca2791261d3f4f5c98c95f44abdbd879a already ensured this, so there was no need to merge 6ac0e7818399a57e4684202bac79f35b3561ad1e at all. This commit therefore reverts said commit. [1]: https://bugzilla.libav.org/show_bug.cgi?id=1012 Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index a4479f889b..5bfac4ea5a 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -197,10 +197,6 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g if (w <= 0 || h <= 0) return AVERROR_INVALIDDATA; - /* the decoder was not properly initialized and we cannot continue */ - if (sprite_trajectory.table == NULL) - return AVERROR_INVALIDDATA; - for (i = 0; i < ctx->num_sprite_warping_points; i++) { int length; int x = 0, y = 0;