From patchwork Mon Mar 18 15:46:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 12343 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 E54C2448D11 for ; Mon, 18 Mar 2019 17:46:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFAAB68A7F6; Mon, 18 Mar 2019 17:46:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A45C680D41 for ; Mon, 18 Mar 2019 17:46:24 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id w2so17581973wrt.11 for ; Mon, 18 Mar 2019 08:46:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lvQFVZM9iQiTKmpHYW1DH4egfwg2MU1AsC8zAOmG+To=; b=f8vODhNuYwotrlo78kNKc/XuD8U+C9DPofGe2RIgiWiDwQmgyEe9RKw88PP8y++KMY 2FCNwq75xCJOOXVd6PXp1Zy0PFjuYN9ikEKtr5k/el86+eQyfZQu9c5Yq5TS2W+9DH8L 9kW4+csMEC4IRwHXzdHp9BG7+Chs97xmGvKcxmT6d8Gmxf4U0u0EKRvGQoJPFehc/boc w2z12mmQpLU1DoKkJ1r0ciuHgvOD+MwLxzsJHM9Hb1OzdcRCqvAdtKnC80Cw9WOvgq7/ uyT2I0FQMMYAZLDDtF9ostgkucTQPyGgpMazuYYLpM7F3Lf/OIw+UmFt10qiT5sIDCgq 4Bqg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lvQFVZM9iQiTKmpHYW1DH4egfwg2MU1AsC8zAOmG+To=; b=r9y6pc5XELxnjdIkm+Ptrl9pPGTO9BhOUy8tNvbxMPsAprauuhLntumcGZsnww6Lnj xYpZt6iSUbzkzE3L0hHMANP6S84zzytBAJIyuiaVZ8KNXMTvgqyshzf17T0oH7j9rjB4 4g0ZYCRZ27ease0RwO2qnFhOG/ml2srQe6JAqihsLJ75JKTlbNOvqkuq5p8bFi4NAzCc w9t7cdTaZ/L7x5r4Q4GVEvouiIAShieBbadWlmO1m1G/LOXQLRm1ndsimpqgPyxvQzSt WWka/Umdi3d91PsiNxsACORbFvWzsZyxeH6/Td7UbIwIqeIxvXILjuPNUT3ydwlgz7Gt MRAg== X-Gm-Message-State: APjAAAXDmN9+IEhZZqu3OLTj3PCeEVjP/7aeslLF6HpimIFIvauzFfqN ZaOhhJeykkJINt1f1gbW0ZGBFYTi X-Google-Smtp-Source: APXvYqy+8UsxOneh9dTSw6U6AC2+PzoIuesQbUKS1Rc4hOLzqsfRUW20ja/DCARHu7zG3RNcmTUFXQ== X-Received: by 2002:a5d:6948:: with SMTP id r8mr12355744wrw.255.1552923983479; Mon, 18 Mar 2019 08:46:23 -0700 (PDT) Received: from localhost.localdomain ([81.2.170.96]) by smtp.gmail.com with ESMTPSA id y7sm16222454wmi.34.2019.03.18.08.46.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 08:46:22 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2019 15:46:09 +0000 Message-Id: <20190318154610.237635-2-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190318154610.237635-1-derek.buitenhuis@gmail.com> References: <20190318154610.237635-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] h2645_parse: Propagate NAL header parsing errors 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If we don't propagate these errors, h264dec and hevcdec can get up to all sorts of weirdness, especially threaded, while trying to continue on with things they shouldn't. Can cause stuff like: [hevc @ 0x5555577107c0] get_buffer() cannot be called after ff_thread_finish_setup() [hevc @ 0x5555577107c0] thread_get_buffer() failed [hevc @ 0x5555577107c0] Error parsing NAL unit #5. Error while decoding stream #0:0: Cannot allocate memory Signed-off-by: Derek Buitenhuis --- libavcodec/h2645_parse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 942f2c5d71..175c986c71 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -503,6 +503,8 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, nal->type); } pkt->nb_nals--; + if (ret < 0) + return ret; } }