From patchwork Tue Jun 8 17:08:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Beyer X-Patchwork-Id: 28172 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:cca0:0:0:0:0 with SMTP id gj32csp2181303pxb; Tue, 8 Jun 2021 10:08:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6G/eulDDJKqXYRTPAa6AzVuFunyglkKqDgXupG8rsfCUbJEi6r9ArzXxz5crJ+2RUaZ5v X-Received: by 2002:aa7:d388:: with SMTP id x8mr26064524edq.338.1623172124377; Tue, 08 Jun 2021 10:08:44 -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 h12si202772ejo.629.2021.06.08.10.08.44; Tue, 08 Jun 2021 10:08:44 -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=@woodgrovetech.com header.s=selector2 header.b=SmrHqqP8; 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=NONE dis=NONE) header.from=woodgrovetech.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22649680923; Tue, 8 Jun 2021 20:08:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2097.outbound.protection.outlook.com [40.107.92.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DF9268020E for ; Tue, 8 Jun 2021 20:08:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hHOveWYyyjJmKIeBopmRr0Ev1b2yhfnv5RpCCCDk7GwMc9+RZes1udp5JJRZ6jic1dsbC2WWASSCskPGCJrahqXjbTX8FqaU/hAkbfBE+7E4pPJcOAkG3xYmR42T41uaOJxvB9h+sFdK6y+VRPwpI/z7MIwlFLcI00vYgGtN10Lj0tYFFbNT8IdXdQKyGdcixNva8NyJIf9KK6tR0kpMLE8nzx7TESNWlJau7YgIsR97LLFUuPj3SEdFD2ISVNkY95cGmQrdxC7ieCleYg0GZ8qO0tMhnEyyninktE+z5StBsJo2WdR2dI00oKi4irSgF9DINJJWoC21pPGAqXZ5SA== 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=zhKH/GxuUVkJwI9qdE25MjveaUlBkQNnH6LrB9DuYVY=; b=gykliKl+K0ND4ptrKCBYi/u5dRrecrzLMlJEprM+sDv3zm2bxBu7vxJOrBkee9px2BkMDDkR0krIc+rXVYKeS8OZExeG7TTOqob46k4xDpLMMEvA86PsWcg1NAbjQvyN91QD3sJb/s0pzJWCLtTC/XpHs5maeMwQZhbrA6/0byd4Qo9CRvTx4lqFzzn7AuipRe9icm2uwJ3meWZzW+R8DWXQ4VGiKZilfg5AHRBWmNQsRFPxh18s+J/smnEQayuRw8FZ91oTPZE38re8iK8nunpCmN1tI5LT9qtS/1Zug5ID/3s0Yq//LXpEr6JnKodGCHyU5eZmlTDNKfDOURvuQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=woodgrovetech.com; dmarc=pass action=none header.from=woodgrovetech.com; dkim=pass header.d=woodgrovetech.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=woodgrovetech.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zhKH/GxuUVkJwI9qdE25MjveaUlBkQNnH6LrB9DuYVY=; b=SmrHqqP8Y3NFkDGmLc7nIZmBhRb8QyjgWcsMzGvmRbQxNSToz4FGTr6pz02UuZcWzYntAD0mlmS0IqanJ7eP8Cjyb3Mr9Z1IViThH7ZKcoGui4rkyud9lrSJLQaIv4pxtWwnC76QHiKQEHSCjgS8Aq7K2R0tFalyfpefRbCo6uA= Authentication-Results: ffmpeg.org; dkim=none (message not signed) header.d=none;ffmpeg.org; dmarc=none action=none header.from=woodgrovetech.com; Received: from DM6PR17MB3851.namprd17.prod.outlook.com (2603:10b6:5:251::13) by DM5PR17MB1580.namprd17.prod.outlook.com (2603:10b6:3:14f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Tue, 8 Jun 2021 17:08:32 +0000 Received: from DM6PR17MB3851.namprd17.prod.outlook.com ([fe80::9d78:6ce4:9ac4:e810]) by DM6PR17MB3851.namprd17.prod.outlook.com ([fe80::9d78:6ce4:9ac4:e810%5]) with mapi id 15.20.4195.030; Tue, 8 Jun 2021 17:08:32 +0000 From: Robert Beyer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 13:08:12 -0400 Message-Id: <20210608170812.18976-1-robertbeyer@woodgrovetech.com> X-Mailer: git-send-email 2.19.1.windows.1 X-Originating-IP: [142.126.138.206] X-ClientProxiedBy: QB1PR01CA0031.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:2d::44) To DM6PR17MB3851.namprd17.prod.outlook.com (2603:10b6:5:251::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (142.126.138.206) by QB1PR01CA0031.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:2d::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Tue, 8 Jun 2021 17:08:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26d59562-406a-45b5-bb76-08d92aa00b0f X-MS-TrafficTypeDiagnostic: DM5PR17MB1580: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:178; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KXUhm1Pj0FPk2XCCszK17wkwEQ4hW7zXGGpGPavJZF76IVd1MMT6XmFkKNAuZtnOVex92FYyzFGl7a8zdiYlqge9wOgadibkAK50mx6UdWpTvrqB5GygFPR9IAG00FtHr+NBhwnB6nJF94EfEYeaRQ5wr7l2NXyHqRIuR5YNxdE8jnfTFUIQvIIPtB4wgb0fk6B1nWiem8AsPaYnsY7BiZ7/ktkqE95a1oslQfyPfYtEuXzbZKyReF64bT7DwADeaitPN9zJL9p37W7Fc3qYvJCWf2ZXsTq1wd9FPsvsL2CpY951hOmJHkom0CTS3e18xUB7Sbi1UTnqEtx1n5Cugq0C7LT0ZxkCGWlr3CTORtHJy3MTiTL5q/GRmIs+jCTD0mteQA2MVD0ScqgFSkxlN28TDmmNxyTJ0xt+tlV3GcywCjckCULIfMtswPtByC79Ded/phSQJYKsfZSBFDhWBShK9XcINI2RcnXRU6K0pk88ULYl8NUEeVMBCRmyf7mghxbpcHmiyslLgIy5a/WZCZLjw2C79JFgwWAeK12Y0kjxtwCLXnpvVmfwWkvjVhLg+v5VyUeXa+DjdgJ3w+RlP5hJsaApWmMfHtCX4YSTgPgNkVk69gYU/5jYanIqYZ/XYL8qD65Vqnr9oF7IIdSrO01mk35nJ5vkaWqgYgi3rqoPHAjisSec9IUKyByDd6io X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR17MB3851.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(346002)(136003)(39830400003)(376002)(366004)(26005)(8936002)(8676002)(2906002)(316002)(6916009)(36756003)(6666004)(86362001)(186003)(16526019)(38350700002)(4326008)(52116002)(38100700002)(478600001)(2616005)(956004)(6512007)(6506007)(5660300002)(1076003)(4744005)(66556008)(66946007)(66476007)(107886003)(83380400001)(6486002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N3rLqYHrguaOHkP1QUArKi/BJ9BYvluZ+5cXm02lgJXjmCaoR7t/aEAWn2NQ170bsNBMYhbKYHoX3QFd7+oXx1V5MUWo2YFHco0y3hZIGJ/aZa3C9hQgyP8EOccKymMnOBHR+8h/NXjKTFBwOTFNsHlvWC9+sv65EXI5Ywm5wSEfX/NgXpLsjcvTqk4LU97BeKyDVjKwTuQf6tvplbPvPEIhDL4CIC9hf/XBEUac7JZAvUY/ufxIUPUBWBWITkP3rL5kkkWEYyeLjaQ+h8x4AOLcPBnMZ6+agiVKI1lyBwqCWqxkK5bLlTI+nam4L2O9F9hzjThxESVAHDbY96UiibcQeqTTDCwHV7Sc4WGQb2wQIm0R5D3CldW4te6INlekeCG7BpErAXUhG5vTPgtK5ygaklqsMZtCCoBnEd1pBU06qrXke+b+MEdZi5IBCLz/JA28w4FvOfm1MzzM/Naq0FyGgBI2I7xZzrLKlkviG39EgRSZEbR0EFZ4n1rjisw7VxrPV1ATywoteqMOImWO2QUKvAHMwqxmC0rqWAeo2el2j7SuJm9NITCYcK67kq30EmC1lIoI7cVuWv/nj+HpDrm7NagOe343rSzYViKTNe9yIo3lGsN1NUXbbG6Q61arXOERJix2GZOgazVURk7pcVjGjZC9qIxUYcC07MEqvX0/eqdrEe8OkfWl4kvAmCezSp/fMzjTETAzgxsKsvZtO7mR3CPTgn2x2dcOLVQkNC5RMAZOIAy+D4LVApTTZKKjFQtmzy/Pu/jGmtmrBK3rRb5c8bDqIIdMqkfUpYluxX474Pit2XhZYMNYkxO1VdyFb4/QGE6ubDvrkar/68fVz48v0nxOBtEF7xGbjEdqbNvN1V6ift0D9p3gFKlBO3Xpc3zgAMW6dClrH9K2iMzGxBqO4/6jbez6OYLwrR4whKaBf+efoqU3UT/JnBn9Tp2xyO66JhsuDiA1J++J8SMomVEESN6JLqziwdjzeC8Iz5AYv1PzG607EXudhiwP9H+PRtIolAaR2/F5F/jE8LuomSJfiq+xvqLnd6jfx73xrv8ftYN/CNlQJ6TKp3D+M8S7rzV/1atUeHNaqjtVpGyk6V8vnsfSRYR/gpcvuFLflJbs/VDaIKUP6tw+VR0t2eKtqTEtWvRLboVGUPpXpHuKzzmBF76fSOWScTOZvoah8WK9z75+OSDsI9SJXEHQLF3SOAQq8M+2skSFLpZz9yQ6aB8JU6eezj9ynQ2dwAyUiKAxZiLO7NDms+w8YYr+4wo4QwHaV/4KlHqPRBQnJaA9JBE9+KB3D4kAWTdJePbG93sJyOYddztLDlWC/0D86VeK X-OriginatorOrg: woodgrovetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26d59562-406a-45b5-bb76-08d92aa00b0f X-MS-Exchange-CrossTenant-AuthSource: DM6PR17MB3851.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2021 17:08:31.9833 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 197f2606-8466-42e6-b244-4de5f141c486 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: k1HpJiNAmYTn3oe4MSGQrvvUqpQ77Wd/GY+8kF2mbMd6FQSu2Moz/pr4210NwJm0vBgPQy4gjliCgFudjQHR0ADz37QyFqnGyGF9PaZy0UY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR17MB1580 Subject: [FFmpeg-devel] [PATCH] Null check of &s->internal before attempting to free dict and pkt - avoid Null pointer dereference crash 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: Robert Beyer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Am61rsFEHSfS --- libavformat/utils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index fe8eaa6cb3..73a7d13123 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4331,9 +4331,11 @@ void avformat_free_context(AVFormatContext *s) } av_freep(&s->chapters); av_dict_free(&s->metadata); - av_dict_free(&s->internal->id3v2_meta); - av_packet_free(&s->internal->pkt); - av_packet_free(&s->internal->parse_pkt); + if (&s->internal) { + av_dict_free(&s->internal->id3v2_meta); + av_packet_free(&s->internal->pkt); + av_packet_free(&s->internal->parse_pkt); + } av_freep(&s->streams); flush_packet_queue(s); av_freep(&s->internal);