From patchwork Mon Sep 23 02:58:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 15228 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 CC26A4466B4 for ; Mon, 23 Sep 2019 05:58:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92601688309; Mon, 23 Sep 2019 05:58:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16636688370 for ; Mon, 23 Sep 2019 05:58:49 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id r5so15496923qtd.0 for ; Sun, 22 Sep 2019 19:58:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=WNc2HHJPz2FiUv0OX5Ch1yBhutaXWdXrEEXJTFs1wQs=; b=akb0gR7NulHmXMRPabrNFw7xsYXfpDz9SYPDXmhOcYJLfXXb0/vgzVVD6D7A2G0GhT bG/48+QTAJQ3rHs9bPBoD9hJNmdZxF8FkaYXAHH10/ercy2p1EEudUbh5gB9a2GMSQRe b6GEkylyhZwJkPT97qjepx5KtTflyYo1L3PIgXsL1MO/ZUDoJU+l6NeAOkLb8KuPZ/XN kaZMQHB2Z/AuNJ2f5+oj8jWAX7Ty4DJyxZGTkZiulGV6RbGVnnnQkZXGkEi/AVa2l6KL 5KwA0MUMUs97BSfqKHNv2uHQ0JVkJSGfOiox5/RMbGIGXpiDHo84ZYnlMWXCCpwP5YrQ 9GiQ== 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:mime-version :content-transfer-encoding; bh=WNc2HHJPz2FiUv0OX5Ch1yBhutaXWdXrEEXJTFs1wQs=; b=s7mYc25ewvD1mHKdmANAqVusjFcUCTX7X0j1GqxK7Ivp7YTiusBpb8CqnRSvPuqhyb HR69FHPPOQIMs8kcerp+OVa3+WFunAFnrfsoQ10GOhmqXKybDAAYLqAGFeKDRRI3Q2VH 3emqx7eUN/Ta5j/DXo53n35MSJlrd1xpDI+nOWSfHnPJjeRlfQXuOzoMJ+6qjQuC44gH ZdqgjgrMegjAjnWGoRpBqzCcmYRgEqbpM49aJ0BKd3RTMzCHQpjOxtueeSdHstv4VzzJ 3MP6vfbeX+CI+8F27+bbR8pvE0N++bRJl989xUuxlwKnPNeWdnltrZ8AKR2aLwopDoNp nHiQ== X-Gm-Message-State: APjAAAXQpOD38BbI+9FFeVtvzs4r8ZO6QmEYRiGm8JQV1gopq+QLYsnP rkyKJ21Yiui31uy+MUi+uEi9l94Y X-Google-Smtp-Source: APXvYqxmJ2JvG4n5hFyMLlO86lp4cbywIQLLNLCMjZoo88mpNkBzNrBk669gaGUr4zq5Nql86wNjxw== X-Received: by 2002:a0c:dc8f:: with SMTP id n15mr23106894qvk.17.1569207527381; Sun, 22 Sep 2019 19:58:47 -0700 (PDT) Received: from localhost.localdomain ([191.83.222.171]) by smtp.gmail.com with ESMTPSA id r189sm4453376qkc.60.2019.09.22.19.58.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2019 19:58:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Sep 2019 23:58:08 -0300 Message-Id: <20190923025808.1739-1-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/bsf: check that AVBSFInternal was allocated before dereferencing it 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" This can happen when av_bsf_free() is called on av_bsf_alloc() failure. Signed-off-by: James Almer --- libavcodec/bsf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 71915dea85..c1653cddb0 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -47,7 +47,8 @@ void av_bsf_free(AVBSFContext **pctx) av_opt_free(ctx); - av_packet_free(&ctx->internal->buffer_pkt); + if (ctx->internal) + av_packet_free(&ctx->internal->buffer_pkt); av_freep(&ctx->internal); av_freep(&ctx->priv_data);