From patchwork Mon May 15 18:32:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 41633 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1823502pzb; Mon, 15 May 2023 11:33:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Qfsvvc3B4ZOTB/Nvav624lS3vGvbyarxxTGsHhk2D3QBcHbrWVKEamFWYumfc0F/A2pLf X-Received: by 2002:a17:907:708:b0:961:be96:b0e7 with SMTP id xb8-20020a170907070800b00961be96b0e7mr31495607ejb.48.1684175604910; Mon, 15 May 2023 11:33:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684175604; cv=none; d=google.com; s=arc-20160816; b=zzOqm80GD1PQSEUVWtG9ci4WCpWQOXXz1BqQe8LB8ydZIDKhaR+OvIng55g5A+MMC1 k5zpOBYu2TE5pAS8wRx2PJSdvMiJrrW3d3YEjtMCajjiPrrVePyKd71I9Pw19gD/mF1f odJ5FbGpdtN7A1wGhYi/sagH31gKJzIjaYSeNrklkIMdW254ZLcunkzoD1/4fgTx5vdM Z8wiIL0sOxq65NoxAsKnKTn95xpAkLbjI3gCLrOBENUu/1khS1suL48aXozhK+S4THJn FJoTatpYIo4nHslkb/L8PJnFmd+yG1Hs6mcX5ZlBXUyfkHsrfbKAtGRv93dauT5nZiCx qtJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=kVOWmSzYkin8Nso3NLDqIsmNPp25IjXOjDcw5Vtr7js=; b=fIwvIshZXNaAQEW+niMaoct43AOYNI8b4TA5i65b9+8+5uG5rljDgKkxAKImwcMGmy E2awnWJ2/VG/YaZXImIzmaVXBVr1ZmA8gxeemoeg30K8DUhsfEh2A+uUFMj+niFQSRGZ oAAJhQspOLlWOhAJF67VvC/YMm+aEljAiQA1ELaoIcJV6cnbWJGSKhnKkrnjDMhxwnAC SE2EzjRWwlmhcYqLPszyJstHMnuMDeiFCeu7Od8g+yBpmmJsx2Wf4bqRdXZoAak3D8mY O/AmLXlFwOJfne8mILI5T4xDUvnH40Q2rTHmXtaVkpFxKDUWE7ARbIXq0tDGzEqVv2uT Wucw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qb37-20020a1709077ea500b00969f25a0294si13118105ejc.909.2023.05.15.11.33.24; Mon, 15 May 2023 11:33:24 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D9AB68BF34; Mon, 15 May 2023 21:33:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06F6D689BA9 for ; Mon, 15 May 2023 21:33:13 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6436dfa15b3so8884344b3a.1 for ; Mon, 15 May 2023 11:33:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684175592; x=1686767592; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YwfQASacb7KSnDq1fcBPzOOGgaRqGc81RHAV9jH/Fsw=; b=c+LQ1xDWynDn1VpqQIu3rakxkSeI6Zfq5k2kWSKv6q04R4/+hRMEwC+p8pg1gFmZGx EAL8xTs39v30AsTrQU/6lqeJS8qTts32ZLnOf6Tc1uqyekBuJymuZ8TgsoTKr4B1Gntc XicmjtlZEY1i+PssR3vwRNo0uXcmtADO3wQ70AuChwI4gZ5kZQg8fe7XFiuIv32NHGNO IE4x1sLcWqTGyqodxrsTmnPIMBdhZDCKz4qw1R97XYuMeP7g+e3G0sXW0RNpjyI3tU2A it64CrXDbHZCWQG7OArGGuIUPLZikagJHxDnvBwwxkNtEMmCPR+GvbkEjibEqOE3vOjx FJ3w== X-Gm-Message-State: AC+VfDwnFY1qm/esNAgOZ7StFsRBzagkUMPJcQCOvuw0EcT1VGwOosTN 1C9TWkxxZGO6zPqXKUz9y/oZ9dJysAU= X-Received: by 2002:a05:6a00:2393:b0:63b:5c82:e21a with SMTP id f19-20020a056a00239300b0063b5c82e21amr44187495pfc.1.1684175591673; Mon, 15 May 2023 11:33:11 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id j19-20020a62e913000000b0063b7c42a070sm12077067pfh.68.2023.05.15.11.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 11:33:11 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Mon, 15 May 2023 11:33:03 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 11:32:59 -0700 Message-Id: <20230515183300.7252-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] fate/imf: fix memory leak 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: P0Zt0bl3yS7n From: Pierre-Anthony Lemieux --- libavformat/tests/imf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c index cfd84fb8c8..c02cd87ceb 100644 --- a/libavformat/tests/imf.c +++ b/libavformat/tests/imf.c @@ -402,6 +402,9 @@ static int test_bad_cpl_parsing(FFIMFCPL **cpl) return ret; } + ff_imf_cpl_free(*cpl); + *cpl = NULL; + return 0; } @@ -423,6 +426,9 @@ static int test_bad_resource_cpl_parsing(FFIMFCPL **cpl) return ret; } + ff_imf_cpl_free(*cpl); + *cpl = NULL; + return 0; } @@ -594,8 +600,11 @@ int main(int argc, char *argv[]) printf("#### End failing test ####\n"); printf("#### The following should emit errors ####\n"); - if (test_bad_resource_cpl_parsing(&cpl) != 0) + if (test_bad_resource_cpl_parsing(&cpl) != 0) { + if (cpl) + printf("Improper cleanup after failed CPL parsing\n"); ret = 1; + } printf("#### End emission of errors ####\n"); return ret; From patchwork Mon May 15 18:33:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 41634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1823589pzb; Mon, 15 May 2023 11:33:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ72A4lKuLNvBNOnlepk7UTOKG7Sqn7oycZ7Ba8mR/tD6xtkNvP+PdCgmYa4NgEMeodqQ3Ue X-Received: by 2002:a17:907:3206:b0:959:5407:3e65 with SMTP id xg6-20020a170907320600b0095954073e65mr34425055ejb.55.1684175615361; Mon, 15 May 2023 11:33:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684175615; cv=none; d=google.com; s=arc-20160816; b=vii/y9jazJMEnxlHEYdho1o06KF/JLi4AHxMjsFPyoMJyjFHA4q5yfQ6t26O+3LpEk 8LScF3Y4dKGlRS2+tfOcuDQI5t/yGO6Zaa7G9+peHQxeYq/qqHeYlGNsgXQWdTyJ/XZt x3aqsW/szLUTdm6gWZQjirCj7oUO/0+Yod0343vHckGuFHROeyVpFfL8w50eAgOmMmST IlB1hThGDsI+dAG1EO8f25W73+v9kh/Hwaxr3paHDvIAT/s+IL/l5fTVVEuB5sTRqCUz onJBy9aH6R4tys2ebTj/IJaQgQ4tteou+0zCY+Iq6iTIVS6s9mZVuyAZFLgM4lEJwOMV MEew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=RWyNQwqCODnGEw72C2Xi1Lh587OR7tMO3bDfgws5fXA=; b=qNJEfstWH7nLGrOKkXNu4xRX6RnFLfbagODVoeGVTto9B6X5K8aqclNr57P6cZi68M 5CQ25xagozVDL+gd0p0y5fqz8EayU0UkH2ds75ELYNe/bfkPqHfhTLf82byW97VMRO0W KmzqO0HxGPMuHDk9N1V1Y0SS4Lxi97fXacre5Vgl0kcUZ9yvDDpf37quF74tXK9y2E7S hQQCjynIUY5txp5YW9Vizng+qB9g6UNqGEg+CzKaeWjBhvRinKDguuxFXMBfaSp8ilrz Nyy5UInQSv5Dms9fd+8LGFnJDT+x2VkH2jc+v7V3yqZrzIn03PdQpTphnzK92VBlnY3v ryYA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id vl9-20020a170907b60900b009657c879f40si12677206ejc.525.2023.05.15.11.33.34; Mon, 15 May 2023 11:33:35 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8050568BF62; Mon, 15 May 2023 21:33:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F44068BE9B for ; Mon, 15 May 2023 21:33:17 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-643a1656b79so9382319b3a.3 for ; Mon, 15 May 2023 11:33:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684175595; x=1686767595; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ROevQ6wdnWMMTONq2fBvpng7od7iphabpESGH/UTQLI=; b=ljl5wtJjh52id82Ys6TCWQTM+2dp5eFrjgREolIY0Wol0mNs/S9KnwN8x6kxSp/xy9 C+1/lBOw8l+ifJggTAoDWGHV6+cCnVRBYED2toOhQGWVJ9+EjgvydoFnx6vfgPzJfoMA LXsaUq/gl8w4zl0Kqg5OeP78DSyuifiA333m+FK5ggXUVnJTLHx2ewcgZGMQpwKmVP8f hS60cfjllEpGU16+0oMXGOqlM0JJd2W++ahL8Wt06zUEqhmO0VXlnwyRsuQfqYaQmVIX /k6pltGbcVF4mpkikdsA4yBQkFFb18PwhMQHaT37GQcpReCpEnsTtpKGoCH4TbkwBkwD CKaQ== X-Gm-Message-State: AC+VfDykFamjda6LnJNM37YD4LPTY2yJh4ppbp/ZYEQ7Ne/XbMHPuGBA CfrifV1Z5PDTjVCa8lV4PeHLt5c5rg4= X-Received: by 2002:a05:6a00:2303:b0:64c:ae1c:337f with SMTP id h3-20020a056a00230300b0064cae1c337fmr3557397pfh.12.1684175595201; Mon, 15 May 2023 11:33:15 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id r38-20020a635166000000b0052863112065sm11855884pgl.35.2023.05.15.11.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 11:33:14 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Mon, 15 May 2023 11:33:07 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 11:33:00 -0700 Message-Id: <20230515183300.7252-2-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230515183300.7252-1-pal@sandflow.com> References: <20230515183300.7252-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] fate/imf: remove redundant code 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IlyuIsqhYnyy From: Pierre-Anthony Lemieux --- libavformat/tests/imf.c | 52 ++++++++++------------------------------- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c index c02cd87ceb..068ee6c58a 100644 --- a/libavformat/tests/imf.c +++ b/libavformat/tests/imf.c @@ -257,7 +257,7 @@ const char *cpl_doc = "" ""; -const char *cpl_bad_doc = ""; +const char *cpl_bad_empty_doc = ""; const char *asset_map_doc = "" @@ -384,52 +384,31 @@ static int test_cpl_parsing(void) return 0; } -static int test_bad_cpl_parsing(FFIMFCPL **cpl) -{ - xmlDocPtr doc; - int ret; - - doc = xmlReadMemory(cpl_bad_doc, strlen(cpl_bad_doc), NULL, NULL, 0); - if (doc == NULL) { - printf("XML parsing failed.\n"); - return 1; - } - - ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl); - xmlFreeDoc(doc); - if (ret) { - printf("CPL parsing failed.\n"); - return ret; - } - - ff_imf_cpl_free(*cpl); - *cpl = NULL; - - return 0; -} - -static int test_bad_resource_cpl_parsing(FFIMFCPL **cpl) -{ +static int test_cpl_from_doc(FFIMFCPL **cpl, const char* cpl_doc, int should_pass) { xmlDocPtr doc; int ret; - doc = xmlReadMemory(cpl_bad_resource_doc, strlen(cpl_bad_resource_doc), NULL, NULL, 0); + doc = xmlReadMemory(cpl_doc, strlen(cpl_doc), NULL, NULL, 0); if (doc == NULL) { printf("XML parsing failed.\n"); - return 1; + return should_pass; } ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl); xmlFreeDoc(doc); if (ret) { printf("CPL parsing failed.\n"); - return ret; + if (*cpl) { + printf("Improper cleanup after failed CPL parsing\n"); + return 1; + } + return should_pass; } ff_imf_cpl_free(*cpl); *cpl = NULL; - return 0; + return !should_pass; } static int check_asset_locator_attributes(IMFAssetLocator *asset, IMFAssetLocator *expected_asset) @@ -591,20 +570,13 @@ int main(int argc, char *argv[]) ret = 1; printf("#### The following should fail ####\n"); - if (test_bad_cpl_parsing(&cpl) == 0) { + if (test_cpl_from_doc(&cpl, cpl_bad_empty_doc, 0) != 0) ret = 1; - } else if (cpl) { - printf("Improper cleanup after failed CPL parsing\n"); - ret = 1; - } printf("#### End failing test ####\n"); printf("#### The following should emit errors ####\n"); - if (test_bad_resource_cpl_parsing(&cpl) != 0) { - if (cpl) - printf("Improper cleanup after failed CPL parsing\n"); + if (test_cpl_from_doc(&cpl, cpl_bad_resource_doc, 1) != 0) ret = 1; - } printf("#### End emission of errors ####\n"); return ret;