From patchwork Wed May 22 08:59:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49141 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp215744vqf; Wed, 22 May 2024 02:00:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJSoR5jwORngeWVXop0H3LB/bRTbNxp5D9m03XkC6dG4L6QcMOH2eP23+W1F5EXpWBduwMSVynDkpI3CUw8fT6T7DtCNkf8keQXg== X-Google-Smtp-Source: AGHT+IGE+QEl/pQLvcyfumUuIVZVXuPA5OdbyVBV7A15ux0UGyd8AsL2YJFnpqQghUhVL2rjbEXH X-Received: by 2002:a17:907:cb29:b0:a62:18a8:1e7c with SMTP id a640c23a62f3a-a62280849fdmr64156166b.20.1716368400155; Wed, 22 May 2024 02:00:00 -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 a640c23a62f3a-a5a17b21ee5si1517081166b.313.2024.05.22.01.59.59; Wed, 22 May 2024 02:00:00 -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="lMRgk/gt"; 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 8625068D422; Wed, 22 May 2024 11:59:49 +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-vi1eur04olkn2097.outbound.protection.outlook.com [40.92.75.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8267F68D40C for ; Wed, 22 May 2024 11:59:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M8HDPwGBLAkSHAT44WMfjpcyU430kQPM2LNfisw5vILiB6HzjZAchZYs/TO5RErz2J9JU4In++pNxfCVmwhObQ78JNBnapU+2z1ojuFLw0BU1UvptiLejjOf3mwnlXu63DJvsUp0pvqbDnBxjLSf9/XdPHXiaLcDNBB1Ry2djV8ohtDLYM3Jj4tVjDdhIASbSguXuEkR2ZzvVobWEHT91+0IEFD+X1EvrZA9dyxtpnnLru2PMd7dcaF1VRmKHNa/QbeUWeds42vQ55YLVC8rhofobFA68HreGLCD/S+1mfaOxDQMeXKiURwrTpN3u3dTiLczFHW4fLAx4I0mUV8OLQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n6zoPNgQJta06Pc2PZ+IxRGI0b/AWLu8JfHACHKqFfo=; b=lLSPGqnOfUlJ6jvBfq2bzpaRRQyQLIMCudj8TOtcS8JXF6wBdmBTYmI2VbrQytI/Pvz3n0V2rVzQ9igaC/Y2Tmgcu8czg1ZI0bWD2dFdDZy8xLuNFZlGuso4uouCxU8ujmB7DmjHeURBBPBClyYokWa0yoJa1aHwLuFanZiR7qvWc2lAVepUVw0w2ZP+sOmCzoeHedfdJ74vQ4z8QGqFNgIT4n/VmYAWjGqk4E9Q5OxcSBbzk85VtRaIKwRRGzglNXRHtAX9gu89DZlP7RwIrho6ipTv6D1R/eLhZwSJxTO0aDiUEYZkmfuaDqL5jV5kgUgMXRsgEpTEuYWrE4vOgg== 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=n6zoPNgQJta06Pc2PZ+IxRGI0b/AWLu8JfHACHKqFfo=; b=lMRgk/gtYDCxYyBV5sdEbIGRzI1J1z5VlHbkYrueNX6YYFpPpbYnlbJsNCsSRJVMba6ERx0GdplzE74Rrg18VQQ42ayEEqNrb9ijbQyREoWxv0jUrAkPrMLqn4P3+/d2J7XVArXKCPlSvWy+AMWohNqM0m1YcEOrh6b+rLHVkmIK4tp7JbZYcrlCeAeCicPy579HHgjJqsc3EpZmrTHpPDXLC75/Vvj6nx3pNd5/kln+fCMr8uUFuwxuHpYu0plJvXOzqeCmJAxHvU8EbLrYiLbGYsb1LfM8TDCEAY7NsZLJtaQRXU32ZgBX2ycx7zUktIhWbXkm+zTomw/Mpmy5zA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0391.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.19; Wed, 22 May 2024 08:59:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 08:59:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 10:59:22 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [s3EdsKf9jJdwbJaFIeIzAgqaM1G4VcHmICnBopcRnZY=] X-ClientProxiedBy: ZR0P278CA0183.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240522085923.3697837-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0391:EE_ X-MS-Office365-Filtering-Correlation-Id: e91e056b-530a-4594-001e-08dc7a3d801c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: ESehgZskaBElMvMcKdjCvrpQBh0EA37iCT4XnHr73H9qUBh7KgiNoSPHq5tnFlX2ItVytGtL0XYIc9nnV4gpXTD+TVbInQx3FrloXILwAGOlZOLEmciVbpCeVlGztCIn6iw30SZnKONrMbRhZ6X4nB98yDNLRBjRtFF6jxSD0zP0Upl0E8A9tMUo2aNTxc7r82NZ2YjUtosDqi1OsjtgCpQrZ3VuMz6xSbH5AbIe59TGawdvTbty5jJpyTVAdi5dL044079IKBLvYHyvy/YpSsNmwbIoKgOvO2tMTYZzWlSYy3Od5SgzcPAotDAZ3Xk547SIMRFqsV0pow+NG0L3M5cOFd0HpJRn2h6Fg+DEAL+PE/5yrXtZ0Tf02+Yn6EV+8QXds/EVUyP9vOSvJ+s3bzYAx4jmPZi5JERB8ijzbnDdQOwuJGyIPe2x0GSEq2keSkE+A+A61c1OtK1IgGS8f/hYZ00CQrW8U8GVW2dgj3Ixz8jI4yTgjxeRNjA4S0tljwFHeOWp+c1EQLzaG0JQJznh/pcWuikItDXTVGjzk3xdsSLmu4T6LUSXEWw4EHeM8Rivq2jez7DxxUC/fhSIkg4MSFccQ47rIcHyquMQm3NJ4jlhvYeqUg948vthlIGx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8yzkwKU+YUmzI7d49GZsr7UtMiYd8dEGlKcCXc3NXh9xA6vg43WX6nFu7U8m1cfMjnuY6AuJlVoK5AkKgHQLwHIv/yRx9cktWJisDH2MC3xPp/nDJlVVIB5gOoDsrLamnkp9wEAdKyf7P65gIqZfEVQNU7BFjTeSbFH9NWdnzlqiaDEXpPQCE5p5vOos1mxKPxlXX5oE2YzEs4M/MrzT3X9QDB7BfhTATxi9RoMIQD4vwxDHSkpw9qybj/rehxyVt1jo0UvWfarJPPFAQv7I4khchwCyAizN/qxF8UxMykN2/GDn3zN+TaWrpjW23aDzxzKbGArzJ5h1TdFwDycqWWaIc2U+afjShec0UZ1bB1jWeM5mo2EaLCwvQrqnMZjsrDszu6MxrlHtG/yg51j3lzGU6bz9V11ve4MwTPdm5z0O4CPZ4TjiLWKWAmBv1BI+4n09QJ+s921Tooa3LQtcSwYV5gBzEE61O7vLxEzHSqak0Ro6o9Xkqi8mcnBUoNn1+HpuVPrGqhVbfjZCC3UdHVZtjY+i3dvjaYYVllCirRip/uV41HtqcvYsxVzzgKy6S8pPaqAJZRcgmmQqHygtoBgpmusm2kwjRyPcbNiPTNfTr7LTDtAchgKbDBReWp1mChYirURGwEKUdh4+EWXJIcWa6QpqipSW201Ig6wyksDha7WgdLlDDUMjF/ycSZ+2j0fzNXl/eqcip/EuBRdLHluZsRuf2HWuwPiw9GNDoOmq1iaZ13Zks3D400JfZq3I/9oQeYppTAIEGszzXvmjzI67QrVBMJld4QLb1AqOhhN5Tlr2mnlFugV01z0DHGuV50yoRRc5zlXZnjkqwk/9Q+vOELf8+GvzKHpqPuAycFdWPQb/3GsguODGuhie/hltaLFiqKO5B7BfHyDvcf6y0CsarPxeybgDBsmpbF0C5MQ/QIvlLugF7k0ikgmcDHfC8HFdYs2KP+jGbBVm8RibuQp9RKZ7KOqF1YDV8P/7nGIHEU0c2YG273gVVG7TC6sN08XojdkUQC+iz3qmxVOoZLWo7clnPElx1dYfx/PAOteX9ckjZTPycGfoZUzA7/T6z4xulggqI018IhwPcmpdcx8MxZMrH5OSNCkpF9z8XB1s5b9Mm2yzy55oY7iS4+hIqQHPK2hrzkvpbsbt+8fI8WWqxVCtjEfUALaEoFzPV/RebcbotU8f5t26/3xNqVGqKC0DVGMygdleM55569A2M86gCxOimgVVXQT0iMebdei19xfM2pCq8iVeo6m1LW7RtWGd4IABaujSzGRwzhCUAQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e91e056b-530a-4594-001e-08dc7a3d801c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 08:59:34.3348 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0391 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/matroskaenc: Check ff_put_wav_header() 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: DYOltOyPRxqg Fixes Coverity issue #1506706. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 63bae9fe1c..76c542d50b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1250,7 +1250,9 @@ static int mkv_assemble_codecprivate(AVFormatContext *s, AVIOContext *dyn_cp, par->codec_tag = tag; /* Same comment as for ff_put_bmp_header applies here. */ - ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); + ret = ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); + if (ret < 0) + return ret; #endif }