From patchwork Mon Sep 6 02:27:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374985iov; Sun, 5 Sep 2021 19:32:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKrec/SuqM6xsRL/5EpW1dc2Dx7Pqte21UcBky2+9LCu5xOCjcDgvdU+dDIMyLfV+wTpRY X-Received: by 2002:a17:907:7f93:: with SMTP id qk19mr10879507ejc.433.1630895521662; Sun, 05 Sep 2021 19:32:01 -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 s4si6058811ejj.578.2021.09.05.19.32.01; Sun, 05 Sep 2021 19:32:01 -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=qg+2LpAe; 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 64F7368A903; Mon, 6 Sep 2021 05:28:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066057.outbound.protection.outlook.com [40.92.66.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DF2E68A7CB for ; Mon, 6 Sep 2021 05:28:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KsDuve8fnEPSlzaJu2h0YV0IC1lgAbpvQB5lh0U8ZkJtTSYRxnLREAZCr1I43N6y+IY71yH546YNOEC8rzfr4/z/3SZZFTR25EmIjTlstwb8nwavUCo8bXOz1sfe0HYjREl60nGKD1hkemvSkk3/+knTHuWQKZIsJmxRInSR1xsOR/5B/nExGF5dXc42cNhXxeFUS9LjuldUH5LvBZ0dXDiiqkZWA7f8Q9dBVa/YGnj13N2ASOFY+jHYWiAkmIjAjBYy9Bg7RHFfbc3vLKIk2nV5yprmP/WzHAyRikJCqCWEq81wJUXn7TKsTthXSsNWW3cAf66TdB54itCDYTvtZg== 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; bh=Fb4Eg4N2P+coK3aeINA7pQ6gq0SJHULXXxHgqP6croA=; b=CuHTZHe1boQ+345rP6XPyMBNjx7pFyEFu0ClV+lm/Cx7bIHITt0QUWKhDkySEMRrO5To3IQtoL6dlK470mNtiPEshRpa0EozOrKrNgeeFiDBfyIgN8uqPRWuKAz4PgoRbYCYvI+5OecHJOcieO92AIEQrNWXW7xNYq23cE1cMkV6QPDdj9YCIk2oz8zJDDfpP3JnEDUh+n6rjTSq0Dkyczf3gJ36gNlH9FJXZHC03w3lGMPMfKKs5K2LS7ByQ6yngPy06YiISk8JzPTtwfIOixX17HPw3MqAPAicdQgPcaC1ySXUcxrW7F83C83/C+c1Fm9UrSSLk+QtqkQAheL4CQ== 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=Fb4Eg4N2P+coK3aeINA7pQ6gq0SJHULXXxHgqP6croA=; b=qg+2LpAeXcWCODRsGK36k6/prRlQbG/yPr6U+isFCaw93cO5YD6Raba+Vov7lai8dvAscli9Wka5oyRwgIl2uTG4bKfKGbPYOvanIeg5aKgJoN7q8/LsOwAeI6b+MQy9reKBBCUmj9UoFH+A6NCGEojZjjimHFDEHneNRzypRj9y9OfT0STbucshQOFfCjjWGQ/JOZYRo/n2Bk9ik2HXFPb/0gxFZSCWRVyA2yw/nzYjw1QRhOoCvBvIfGKcCuQElXMvQcm1935QaPxibaLRJIUbjtKC7RUDYm9041NRKxAyHzZzqpAuRxjhj22CJDoG4y0LG9JxUevFD9GkpmScUQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.24; Mon, 6 Sep 2021 02:28:24 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 02:28:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [dxTfxTnKTfAKBF73r7WKJU7VHXnvOqlL] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1213faa-6a9a-4f7e-c691-08d970de0093 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKoG3ozUoxO9Y+I40UIUGuyEPzfGDvip4AE3DvbjX+uS8O5VveeNeKvVMg9bbhegtyYTIVH5X+DnA/SmVs4wcEeu6GlohyD+HXq46qPYC6wckfG2pGypJxfbVczTUg8GziMnjflWu0CwjaSrg2/FcnGqlp1NQxE7nUOG09CAc1ZJGuSSbVGyXslCKHupU6g+IQjC90fHM5AICKdpMfxGLSCGie1oXkwPYIiURYAq6oM7w9zawaQ+iWnzHXUkaW9ue04Ry/DUYfstATSjVuwQ9YrrYYRjd/JzXtyalHw6TjrOSV0aFYpdtaBHQQISQ0Px830Wb4CfsotN7Wdscmwq+b2BDVjymxm4LBS/OchPJL/N4YfVNE6Cmj8PFcdiJ3rSYfmxPYMf5ZD97dnRFP1mNrhOP6cz1wlIHb/mo78auQyoMDNrV5+dL4YiEEpfFbrimc/8nVaXGWnLD1Oo6pB88619AsJ0dbooPbCFfhEZv2zX/i2I2pqXEuqqYbyk2TSpXMqA0/hFvlxnZe6IK3tLkeh4WBtZNYwJboYIDx6PRwuC9VavVLXsV+DN++aITTkYWpady1H3aXWJv7mUilZDEXNQs1IZCRaJubmgp3YjPDVeCqStfu8VJOviU9G3eyfvamXBF9y6A33bgnmTUPI4rsycJCRFWMklBzOd0+j+AYzSC7JMaPCUF/3eWJAntewey/xeme/kgXBRA== X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VumxP9LDPnU6SqERAbZnYwq+aM1Zbb42NkKNP2Hbd4gCoKqVO5gjW/QHFlcANvkisdG3EsT4lBLqcMBWuponPcNzJDkC2XoTep4ub3Hh2fyfPx0hscYNynmP2kOC0SoytwDJOGFSn7U1h450x1LXE7Zwa2osTfQaF1doPI+1gV4imMrxmOBdiehyV1N6r4ZTXu6B+mdN3mvdwgrEmGBMuuJMjhARz+2UswApdsNUf1EJGWsLuDHH9P8Og7GR2vPk4cZaGGdEyZoWKDmt5Epz2lZnX1kySyBn/nXcxDbpnAmWIhBQ/9EkOmoc4vGNzPGQDfv9xPD5xca9VNw19Lc5YZX5/5yWwyu3gwg5vZS0lAWGsK8ymUEflfUreCLEBjTG94JS23hWVuWlkpuT2PcjZQHdv+aXqCtfP1D8bhwQ3HYh23eeAHM1XBaphEkcyC/J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CVUxxqDgJVGCdM5QoAO14Ry36xsSls/UPqGGN5P8BOsRPr9jh4fXQEHeatWo7msIicDL9ux6c+pxi3SZNTqN2PXoPFRgrRI+fQ+3Ycej+xPXglusT7tP4gbVaelT1AtSs5/cTdZZPlR6kCMsm+6A/Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1213faa-6a9a-4f7e-c691-08d970de0093 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:24.6481 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 17/34] avformat/asfenc: Return proper error codes 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: IRwHUG1zcJAO Signed-off-by: Andreas Rheinhardt --- libavformat/asfenc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index e4d74c80cb..13d7eebddc 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -625,8 +625,10 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, /* WAVEFORMATEX header */ int wavsize = ff_put_wav_header(s, pb, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); - if (wavsize < 0) + if (wavsize < 0) { + ret = wavsize; goto fail; + } if (wavsize != extra_size) { cur_pos = avio_tell(pb); avio_seek(pb, es_pos, SEEK_SET); @@ -703,8 +705,10 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, avio_wl16(pb, 4); avio_wl32(pb, par->codec_tag); } - if (!par->codec_tag) + if (!par->codec_tag) { + ret = AVERROR(EINVAL); goto fail; + } } end_header(pb, hpos); @@ -735,16 +739,16 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, avio_wl64(pb, asf->nb_packets); /* nb packets */ avio_w8(pb, 1); /* ??? */ avio_w8(pb, 1); /* ??? */ - ffio_free_dyn_buf(&dyn_buf); - return 0; + ret = 0; fail: ffio_free_dyn_buf(&dyn_buf); - return -1; + return ret; } static int asf_write_header(AVFormatContext *s) { ASFContext *asf = s->priv_data; + int ret; s->packet_size = asf->packet_size; s->max_interleave_delta = 0; @@ -764,9 +768,8 @@ static int asf_write_header(AVFormatContext *s) /* the data-chunk-size has to be 50 (DATA_HEADER_SIZE), which is * data_size - asf->data_offset at the moment this function is done. * It is needed to use asf as a streamable format. */ - if (asf_write_header1(s, 0, DATA_HEADER_SIZE) < 0) { - return -1; - } + if ((ret = asf_write_header1(s, 0, DATA_HEADER_SIZE)) < 0) + return ret; asf->packet_nb_payloads = 0; asf->packet_timestamp_start = -1;