From patchwork Thu May 13 20:22:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp703991iof; Thu, 13 May 2021 13:38:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfnfUE6cxD/gBr6MAaJKxLNWqFjfZd0GdNc8pmiS6DWoUbT5fJYUVHLA80/3J5smoaTyFq X-Received: by 2002:a17:906:1d43:: with SMTP id o3mr14549316ejh.466.1620938320729; Thu, 13 May 2021 13:38:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b8si4179887edd.8.2021.05.13.13.38.26; Thu, 13 May 2021 13:38:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Hxo8UvUV; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C99C68803C; Thu, 13 May 2021 23:38:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074021.outbound.protection.outlook.com [40.92.74.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BFCA680549 for ; Thu, 13 May 2021 23:38:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PN7mN6xiBOcUoZBZlxtsSyYow46LaS2hwwI6ImePDJovHJQDJs1v1kOcEiGjHgrFuHb0Xcq8SNjK9JN53XhA8dTp1dzQshd85ZJAbhhVKLbBWbtWRugg7IRfjd6RVQBnkADRJidZLcIG2W7Jb4Sc7KKPU72rGx4oc8BxJHh6l19NUN3B4BtI6LGsTTriP8A/Upu+2sXjcTfJJ2ft80AmuVieBJIN3EFld/SiqPev2UjqqqynNNSgSY/A9Fgz10rbTB9Zg8o+1/+3Ou5VT/LbBy5j5baV4GEe28MWahU7NAAJQl+fHWnc+cM0zUaJraG9q1OIOpo1QguMxu+BSYuu3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uq9/3+pXOjwUABta8jHA1lexFTAVlBcn0spL1LauN1o=; b=DvgCynaVJaY9A9Q2/oudtMw33YX7Kx34tiEWndG0IPnfWfEgdBWMdAhIj9HaMz7XUwkl33sjTsc5u75GyFRUmKUC2yPJHsJMXFFaBB1op8BhYxALawwpFAjDJlZNVZR/0ip81o/zDN95QEBsLvrCwUsQIXnWnoeQNIe+Tbm6YxQgEmghFLrVLjtV9aqWkk3PQIFyb1vyF5s5vRPRNol7zxbzU42HxMh/+RUxmcD7WuhbW0QueL4DzkubBJHhTMTmHuuDf/ns7klVFMCIdF3UWxgmXaN2Aa/H31+kMhnm/a4Cxvx/HY4ilso/mDMtm/mce1JGCdUu3HwME51KZfnoPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uq9/3+pXOjwUABta8jHA1lexFTAVlBcn0spL1LauN1o=; b=Hxo8UvUViTJBiKhSGPlcyvbH0MHvfsw1U90HV4lh36OVMfI880SEU7YySAavzRzUqBMFz1e5k6aK3D91UM7cUUY1btS0/qydMVy/csLjrPAkhJrEW+R94IWVMmCuCV0Ao3pXSyo2l4A8gyhiOAaEykxoVLhBrZnIqVYvZyj6Z50oHMuvGE6Q8GbPObuPP9E/Gk/v4mLzyyA3UFxxuh53DYpuASRDpR88ImyGL7ngRgsLTvpJUWc0ntZMkQwDcPkZkllLJtaf1e82ksB1qoBZpc+c7cw5c37C30iVSzsEqvBXp5zQdbcPKjRFKltPThs04bBOcSqwUEICdKcVQ9P6Jw== Received: from VI1EUR04FT055.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::42) by VI1EUR04HT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Thu, 13 May 2021 20:23:11 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::4d) by VI1EUR04FT055.mail.protection.outlook.com (2a01:111:e400:7e0e::173) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Thu, 13 May 2021 20:23:10 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F3E33005E60912160FB3A98C0B07925AC677602A2B3CE3DC3529D8AC96AA9A91; UpperCasedChecksum:0435F399559751465C055C7DB6C5D37FEC7F5E1717EFA63AF89EDE4F68BB5056; SizeAsReceived:7415; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4129.028; Thu, 13 May 2021 20:23:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 May 2021 22:22:56 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [rFCqE0EN1aKM0nWxwtGjB21pNgMbzKKQKIwyUUv9+E8=] X-ClientProxiedBy: AM0PR02CA0200.eurprd02.prod.outlook.com (2603:10a6:20b:28f::7) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210513202256.841951-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR02CA0200.eurprd02.prod.outlook.com (2603:10a6:20b:28f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 13 May 2021 20:23:03 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9510a1c0-7bb7-44a6-b4da-08d9164ce960 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsCjIoB/W34B98XNNqr0fJl6NNtutnYkHy3sjIONApXOmZEZUPyag+1k34KIC5oub3s3sA94RGE6BjxWmVZaQ6Px8z7i4fzaTeBUA1WAq2nclYAH1/6q/hKZy5t751VnZlNcWKzC/1+hrlMSp62qmym1Gl2GQFWegk7jKTKt6vDKcewp35C8reaM2+yrdC8Ka3KgI9i2LECwfmpO7Pj2g5FsbUfeYLgIKUChHzWUN2ljTD7hXyasb6z/hU7DrvxqsPahJIANEN8yCeRMDJU0VBKZCrKDTEGglUZTFDisKTEIHZnpgkPV1SrB0lWPxOJ/i94CAAO5DrA/PWUjBCeE6zPEuqXZrFtDPnB9il8aUaTjyF7N3mbwqPK0d8s5mvHRxyyZ8mdAIi3YqPiDzKY2SFkYSj4QhmIBhvPs2xcvNCaL9iCQboO2xkhBFWzlKjwZwA4BIIWMRsthFLQwpuud8cE4Rkle/O1QSJDyRpTZTXqFS8s0NsRnsKVLyz4Jk6rH7xNZyEGJEQ9NxhjsB6NZLPxa/4204r0n0xtTIlXMT9NJKQ+KlVzyVUeLkG02sWh5ADi/eLaWMDJA8MRglBOmOVO/4SHNqIY/dKX1/bP9dfX46iX7238cSy4/BjFRRxJvfkhXLOIZsEerWEKGmAMuVpapGwGnSpFDMO/QhN0EQItjD6oQCG2AwhBmCDuMGu7cL8T/4jLzQ5L6U5wKZwutupgJ98S3pl3IeVVUNFjhzTJW6jrKbB+eQIr0y74xfHX7I2SP6n+pd3/zkXtmTvtY+hF X-MS-TrafficTypeDiagnostic: VI1EUR04HT016: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jRqI0Ny9klautHD81pM10DZWhmxrAVs2KxvYw7M6k6/5NIlr30Uc3puugdUzmqFBnbkfQFlIR6IK9qZnufeHwb3NljmKlYanHLOoUzQv/iB3fgeHGp24j05UTZTacx4gGk4RDlI4qff2B5Aq9UtaDT3NKQmpj67MKYzT1YGQ7wS+mY2ih47rl/7nt9ijITIre0049FE1cIPUue56gFIPm3wzqM2tM0+z7UWYLUikkdrCmxgp294JERxCT+Qu/tJtcqKULqs1pDtqzDUM/PQ7FvXAcGSwfX4yGNHWKUEgMeH9ojgh+QtogmhDklkB5zZYBlXao1WtWyUIldl+MruYM7ca0fVMdiylDYs1QzMTTbRIgP3MB8SMRgrhjGFWDk10q+witl+sypyglrbtsKn5YA== X-MS-Exchange-AntiSpam-MessageData: IYSXmwE0NsrtPWv3PPGBfvTdoW6oDkbGksJLXlDBy54dkbmodEX+wMZU6HwpmhozbVPMcvFcVWB8OCHEnGoGDTtKf8dAaKhThCcCfAJHNfvPxxg5IP8zZwmT1vHdxByh/39edok4zYIVzdJCK5X6Tg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9510a1c0-7bb7-44a6-b4da-08d9164ce960 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2021 20:23:04.5987 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT055.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT016 Subject: [FFmpeg-devel] [PATCH] avformat/utils: Fix NPD when allocating AVStreamInternal fails X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Tg8IBOeCZUma Regression since b9c5fdf6027010d15ee90a43aa023e45a5189097; fixes Coverity ID #1484786. Signed-off-by: Andreas Rheinhardt --- Checking for st->internal->parser is btw unnecessary as av_parser_close(NULL) is safe. libavformat/utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 492e08562e..85546267f5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4262,13 +4262,12 @@ static void free_stream(AVStream **pst) av_freep(&st->side_data[i].data); av_freep(&st->side_data); - if (st->internal->parser) - av_parser_close(st->internal->parser); - if (st->attached_pic.data) av_packet_unref(&st->attached_pic); if (st->internal) { + if (st->internal->parser) + av_parser_close(st->internal->parser); avcodec_free_context(&st->internal->avctx); av_bsf_free(&st->internal->bsfc); av_freep(&st->internal->priv_pts);