From patchwork Fri May 21 09:17:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp342835iof; Fri, 21 May 2021 02:23:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzN1dslJyVOvBF/0bvl8QglHMp175WBw+EKg/lZMXStYCxl4J/f+zcPtO+gFLLdLCp1k58v X-Received: by 2002:a05:6402:1c97:: with SMTP id cy23mr10202941edb.213.1621589005178; Fri, 21 May 2021 02:23:25 -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 j1si5226847ejx.156.2021.05.21.02.23.24; Fri, 21 May 2021 02:23:25 -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=mvhHWC6L; 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 6F39B689D6C; Fri, 21 May 2021 12:19:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075093.outbound.protection.outlook.com [40.92.75.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D19B6898FF for ; Fri, 21 May 2021 12:19:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nzBue09GiFf7yIKDOambvFSbfimCZzIU5egzm8V2wowWtkSYUevb0WMG2aEAGQIk5FbFSxSmVdgr1mapuuYBexmqfuWUv+K9XzvGtKXNYUAW/uj59da6vugC+atixjBQGFlDriy2BxQ1vqWaM7ZLM2yIYjwTZArvi4m9/h4vzGBTDab5Mqd98vcJyCRWjbjN+6DZsNrRyqsUuhcSwSICPh6r0FVLkcCOJ77FtG+g6krK0mCd2j5g+q3uk+ImxonlCevhflXaU+aufRG1gKX6wmklEyP/hVW8umEm0PRkrzEh/8G7Iwh/kBk+CI/cTqvU9o9dgiK/NevtkHSWcbhLQA== 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=8IWXfLVGovkS6kJ4g7gJxxHFK5y9tt7iWG5NncSqD7M=; b=ITZkf+/o1R1U6Z5oKbCVqV0Ndh8HYy76GbqdgBXPo9W9OTmnbUXByfCNUG9rA83IiNhU9WdiiUxUavGqTskFr6ul6jA9InXOPZw/piIVRHvmaCA98apH3EjJYtu3dpSCq9BVDrBgZRm5omp4jggcu0QgwHpEArfEjTip2lQEbrBfPBDpyLoppJc34HPXcJIrC7YWbnUg4ToNRiVgyWpgW890SMyN0wD2GAIpGV9JE7KSke1wHrAUmjnZq3D9yCz5UPjQsWmJNgZR2b9rlMrc7khpaKX5zURqcGT3sQb2OYwxQqUxBQN/Brnvgw7Ryg6s+Fc1lDdh7muvZs2cRQ3FHQ== 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=8IWXfLVGovkS6kJ4g7gJxxHFK5y9tt7iWG5NncSqD7M=; b=mvhHWC6LQ14qmuHB6jEtuURRnQ//mgVKdUDAJBOyU4TlzOh5TXu9L4B6Mu38cemLsWyXYo9Zj0DhNfnv4C9MzWl0tOSFRBOj/RSOVw9dxb3gAETHutzpue/GUFd6Nyjmso+0Nc9PAELaDQ6K/BD56aeNUfUB1Duxm6QAu+J5OAb5L6yyE/NHIlxcw2BoPD9Y9LxHeqjz2NBIUVgtu37SI2RyEJMF12qci1HcV+Qf+P3VdfojSshTA9kEqApNjPpcVRtoMs6tmFFpTJydjw1YVgt2b5jbChAslnkvQEGYfusuYsp4CBiqdotCqGr8s36ijw3LUgwhwAU868qae/Np/A== Received: from DB3EUR04FT030.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::41) by DB3EUR04HT022.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::312) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 21 May 2021 09:19:09 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::41) by DB3EUR04FT030.mail.protection.outlook.com (2a01:111:e400:7e0c::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 21 May 2021 09:19:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:E2FE9D74634037DED5F5EF4EB7BEAE7CCF9AFAABA5ED1DCCE558C30909C7673F; UpperCasedChecksum:D9B2068821601C36D5A35D997798045824CECF5FD4C008C607DD13BCAAB1DD30; SizeAsReceived:7767; Count:50 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4150.025; Fri, 21 May 2021 09:19:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 11:17:37 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [o3yOUdI/BJ1OnhTiGGPaKB1gWPtdt10P] X-ClientProxiedBy: PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210521091742.184902-33-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.27) by PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Fri, 21 May 2021 09:18:39 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 655d10a2-15d1-401e-efdd-08d91c396c06 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIohmq9k/yScywu9xPSfiUScGxWs4kdpJLON82pBAb6dFrvGcGp5o5p2hSbXT074X6j43G4m3q/dU6lgOZ78qx6Wu2P+KIUah8XrqdqwUa88xwFYZG2/mU1A8Pxf4DYm1sqa9m0yQ3S7hMG+4vNeJQSqX4ZpHHcb4YhBsU+pYIJ0k84TSVRCefoWzXgsQ0JcdbHC6OxzwO4WIP7TbVvhRBFXkEpxLrbbvhLN4jMFfN8iyqWNePr5iXGHGGBslCqzRiYlM+k71x8mlVHYMwK7yhvvUvESRiJcWHTA+rmP926FLEMj3v1BFQ9IXt+EyPdlfMAMbS/T7KRVK6SNINUOh0qQIrcD7FsAHSAZSAw+1AgSc8WU5P+30290w8ZfPq71uplwmbIrE3ES3eE0PBoOERmJiSS8JxcQQr9j3gpcUYL+whZ2qdJOcKeuLG58/QqCheJRw3UBW/1LG1fY3ne0T1OmWmN7DgRG96OyadXSY0amdf3DbdAVC8Wxt05lqdZzvMTnCjYWlmE78Em+UEsLO/eKaEwGQZpR7/OEed6cP+uuHDXL9Bl1jbynkdc8RuaTGejtR2Kgmd1U9+aKL8JNCDg1L0NV/bw7loaZ2SRAI7wmwZp3r07oTfNeL3gH/Vx65rCGNLaGs+mibNUBOcoNnlI4mTwCU0n37PLuB1DXhyE3fOS01+cGNqqlgRjOCH2dHBEIxmAHSSltQ== X-MS-TrafficTypeDiagnostic: DB3EUR04HT022: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9ecneZHPBtgM4J6l5Lxl1ZRLuRkIjwaqWyL5/Wmz890aryqOh5wfB3LahKtDBy4dKeRP9CgThP12SK2anLNFU3KKc7x325Lm4QaA17ZSKuozGc2I1g6ASkgJrnTaBjTngZ5G60BbdbHJodXjrw90eEnAQlz1V6PlMIB59gvEN2XT17kvx70uIaoc1FPAmMVZ7jb+pAYQN6IyQ470uoMC28ks6lN30PEwV4K4WYoMJdYljjqdkN4YooqY4WNYm1EpMUYi6iReASJk9b8YjLksnDf+u5AbT6n7+LPY+yMnWsuJslZSfWCT1KXB98QIt6arU8vHS6a/D51FNm37kBQf+BQWLP9hXZJhpNQstU+X2F7gAvwlHu8dKGT/yin0+z0tQ136IdVebuRsT18UUlK3pw== X-MS-Exchange-AntiSpam-MessageData: G3pAs+u/uPX8CMqBP2QyefvM+IbRSMlf9V8ezhwJVZDf23j7HiC0yR5eV6ZUHjWfNzfE5kwCOPV7Zt3AymV0Xc+6KYV9jIs3abW0yio95WDQlWGwO01WdSOIkJvbI6S3undt9q8ob6AGd1OQkZSSgQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 655d10a2-15d1-401e-efdd-08d91c396c06 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 09:18:40.4481 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT030.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: DB3EUR04HT022 Subject: [FFmpeg-devel] [PATCH 34/39] avutil/opt: Check directly for av_dict_copy() failure 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: GvUn0vMMoO0G av_dict_copy() returned void when this code was written. Signed-off-by: Andreas Rheinhardt --- Should one add AV_DICT_MULTIKEY to the flags to also copy dictionaries with multiple entries? libavutil/opt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 4124efd9b6..41284d4ecd 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1807,12 +1807,13 @@ int av_opt_copy(void *dst, const void *src) } else if (o->type == AV_OPT_TYPE_DICT) { AVDictionary **sdict = (AVDictionary **) field_src; AVDictionary **ddict = (AVDictionary **) field_dst; + int ret2; if (*sdict != *ddict) av_dict_free(ddict); *ddict = NULL; - av_dict_copy(ddict, *sdict, 0); - if (av_dict_count(*sdict) != av_dict_count(*ddict)) - ret = AVERROR(ENOMEM); + ret2 = av_dict_copy(ddict, *sdict, 0); + if (ret2 < 0) + ret = ret2; } else { int size = opt_size(o->type); if (size < 0)