From patchwork Tue Oct 15 01:45:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 15755 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 41BDF44A0F6 for ; Tue, 15 Oct 2019 05:52:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E402689D71; Tue, 15 Oct 2019 05:52:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 424D0688126 for ; Tue, 15 Oct 2019 05:52:05 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id z67so17802073qkb.12 for ; Mon, 14 Oct 2019 19:52:05 -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:mime-version :content-transfer-encoding; bh=NckrLnFLq4A5j7kISDFJqpsf95gy6DvWDLyyRigGlj0=; b=HeEI/1B8l4AyTLgMXxahIUs0GCOmLOKOVUUlMGtCAV3JRrNksLYpW6iqSI2NBRVguC 4bEBf9k4IzsM1SAxCXgAVikuTLm+sRlhCRiClMSJwqgxZm66RNr4ZwwXBhtjhIrfYfM5 IZG1132v+1WXpODY3i1rrttvzSq5xh+DwdDe3cFacivrNtL54h13uwyf2jGT2pwMk2Cb 1JKnH50Lv/apMYhOnRjCYXDW3Sa7fQihlE1XmydR79L2UkB5MI4p/oDpSfftqYkJULlY gcFaQrVXeHVmd6+RoD1s6HlQME3Uxj1ukq+bXweoZJ7sno+MMuBRbUw9EJnKCJVjZgV6 3fqg== 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=NckrLnFLq4A5j7kISDFJqpsf95gy6DvWDLyyRigGlj0=; b=bfVzGNSsRwzaY+Q+fH3PPl5SVjbrmd8QR7HJO3SdoTDWUgDCgrSJH9W/h6WH7Y1y1P kTBTLI68nFx4bP+muvoQAZV4xv0gHoi4D5ssp74N4tGviL1sjI1E35fQ6nloZpJlHVaz bRE8LJS5UmavKZ/PF1BLrBopKIdEVPw9AnUlYFehPSCJL93Ab17aETPg4CWpSncoIRg5 sWdU655Nd4I/m74aZBnKboN/Lsv/sncHHIBX8lc2RKwQLsV8NVuClhTBafkcur66e2QN jdfybVihRcYtdU/N8WlxSHdK3UfBBxdIxVs1Pp17c4Y3SNSENU3yYidDYGskzrT9Df5H vUpA== X-Gm-Message-State: APjAAAWnwlIVNh0W1ljSQJx1UtQiDg3dlgbRCmBto2yv++QdKTPt6IPV VbKfxFNGErT2TE7vQeaM0MzFeP8l X-Google-Smtp-Source: APXvYqyfAERKbROqQ2rP+oSgIyipqPLthuGLR8MMJxAvDizGephfw9mYYQ+41+qyTkXJSSq7O/1aXQ== X-Received: by 2002:a37:6743:: with SMTP id b64mr31814656qkc.453.1571103930195; Mon, 14 Oct 2019 18:45:30 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id x12sm12577398qtb.32.2019.10.14.18.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 18:45:29 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Oct 2019 21:45:18 -0400 Message-Id: <20191015014518.25746-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h2645_parse: Reset nal_buffer_size on uninit 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Without reseting nal_buffer_size, av_fast_realloc will fail if ff_h2645_packet_split is called with the unitialized pkt as argument. --- libavcodec/h2645_parse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index b1dba3d510..d3d065f371 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -525,6 +525,7 @@ void ff_h2645_packet_uninit(H2645Packet *pkt) } av_freep(&pkt->nals); pkt->nals_allocated = 0; + pkt->nal_buffer_size = 0; if (pkt->rbsp.rbsp_buffer_ref) { av_buffer_unref(&pkt->rbsp.rbsp_buffer_ref); pkt->rbsp.rbsp_buffer = NULL;