From patchwork Sat Nov 30 06:38:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16498 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 D88B74473BA for ; Sat, 30 Nov 2019 08:38:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5E2368B435; Sat, 30 Nov 2019 08:38:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5882668B46D for ; Sat, 30 Nov 2019 08:38:30 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id u18so16124343wmc.3 for ; Fri, 29 Nov 2019 22:38:30 -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:mime-version :content-transfer-encoding; bh=HDiMtaC+i5atkf7V5VvwGGywT/i1kOPmxI75OBTQObM=; b=b8QV5fmO80yFtpufMyjRF7/AphZst3qSO7sEBrtiYvTO8ap+wy0hk2DvtPdA79hw0h I/XDV/rOnArSiM7sLbwgpjAdVxaWGga+pJbS30momWIjTzJxRAHOi2LO2uDtPdHWYyLy y7BHm2GwmG9yXI5JgnIQSYwZrA63FkgwRqmpr6mefdixlMvNXDICi+MSwrcasqMXYYR0 zKbov83rZ+PAL/AXsp8MTwkYrjHpkWrDhh62f7eOo9641Tqw8m0VvcbxGJSbuHJgpaXR Kry0HRw4ih/wPJ1Ty9oOgJiy8uduvC2wgl9uz9w/DPHv/SAOT1jKJUDRzCkghnWHgVZs yPkQ== 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:mime-version :content-transfer-encoding; bh=HDiMtaC+i5atkf7V5VvwGGywT/i1kOPmxI75OBTQObM=; b=WB9VLqW6ojZJyY2Re9Y55vVRfPviOHNxELo1uwaVYnTzBN/IGzv4Ervzp46HWg+Tqz 78Sfq5fTHD7Sq/17Z9WkiQbve6GXlAKriwt2Ffak/wSPvk+tdXJ72+a1M33e+rqV+CM2 ig4PtrCct+RfO5MC/oyuueVxFOEKga8UlEztX+3G4fCC5LoZepnbhBM0MSHQLhQFgyvO 6y/xgZeL0MZJTvzlbcqu6GnsQc4pvOeKh6PKhHHEJ9rGaXR8EGDkCPhEdmYuynIIKPGl W9WTRdqlf05WBie7CFAoXncaZgzTQyXhNQQD9v93BTg8Sk0UulJKb6ZNJIfxHdp1KsUy x9sA== X-Gm-Message-State: APjAAAUCox/OYRGDZxy7VKpUqlfsVvWkxIwphkM6uCLG6IGsZV59wOFW hmTdqzRr37HhMHY79MFfD4Y4H/Vt X-Google-Smtp-Source: APXvYqwTWAhgCMMabNa4s6+ITNzTUhEtBNT29aV83m0fcGYS2IfoKPA5zxrlBMtD5Z2I1jNdaBTUMQ== X-Received: by 2002:a1c:23d5:: with SMTP id j204mr18382340wmj.0.1575095909589; Fri, 29 Nov 2019 22:38:29 -0800 (PST) Received: from localhost.localdomain (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id 205sm18774284wmb.3.2019.11.29.22.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2019 22:38:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Nov 2019 07:38:10 +0100 Message-Id: <20191130063810.9665-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/extract_extradata_bsf: Don't unref uninitialized buffers 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 happens if allocating extradata fails and s->remove is unset. Signed-off-by: Andreas Rheinhardt --- libavcodec/extract_extradata_bsf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index ff111de48c..15ffed6ba0 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -85,7 +85,7 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, } if (extradata_size && has_seq) { - AVBufferRef *filtered_buf; + AVBufferRef *filtered_buf = NULL; uint8_t *extradata, *filtered_data; if (s->remove) { @@ -179,7 +179,7 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, if (extradata_size && ((ctx->par_in->codec_id == AV_CODEC_ID_HEVC && has_sps && has_vps) || (ctx->par_in->codec_id == AV_CODEC_ID_H264 && has_sps))) { - AVBufferRef *filtered_buf; + AVBufferRef *filtered_buf = NULL; uint8_t *extradata, *filtered_data; if (s->remove) {