From patchwork Mon Feb 14 19:39:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34285 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5800163nkb; Mon, 14 Feb 2022 11:40:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0fbWdy1jYkd6MPkjCyNAhQMlsuXhwOz2jGfkNSsCcAsMdSoC+okCvyaqPVoA65BYont6q X-Received: by 2002:a17:907:6e90:: with SMTP id sh16mr286416ejc.456.1644867646889; Mon, 14 Feb 2022 11:40:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644867646; cv=none; d=google.com; s=arc-20160816; b=h7rywcE000CK+sDkv7iXvl7qOskcd1qDnCWTl9yRwpfX4cdzD/G4wjSFroMA2rW5OU V9tdggjXq2xT70teCiAeN2F7uCKCmgzqd9dljqnR44A52Tg4sMSq1xRq0rYm06rWjbBQ sO2ZF11+zadbqUiyvKBXJN6nD4MN6f00cdE40gLfOWlJVeit45ZEEQ0pyq6at6WSbc8p NtzxSpSIKvUI5EKN0asMF6tiU+7wFrMeYjXVejOk3YzH7x1O37Yu4nVDV1tuHGkynZnE 1zTDR0JSXYpQkhrwfhMaNK5Cdxkr9NRYqrwIVFUPi/mXRK58grG0ivZxZEaHTAX3XJB4 gnOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=1bmpbvX7wGqwCAX7Inrqhf4WHMGShMBrNk3YHUbKMCA=; b=MZDjYlfpYF5dJfr0nrxpjATEaAQWZMKJsw4s7huBBvBbl+JoTJDozCJoSgTVuyAPyk sIozFLFwyRVyc6oTCzvfi3gVSlGB0lKiZQGvsiO3M48GWqOiwHcCDgBUv9uiDWzx8CH2 i73XegZk8AFWssuHyd1Hb2z7WBwC6dHa63WrFRnHyOammBCtnAbtZgjrFK/BybShqJyv CIzsrRKqJba8b+pNpweanO/NkNPlt0MKd0iV9iaHcT4vT1r2YYvbcNK4NUSX1qp9dEya KLA9URtIlWaAFr3QZubLwa33Kad8P6G1Nfl5HN+sfCCjg45suyHnuu/Y0uXiiqonipoR Iugw== 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 ji3si5201681ejc.39.2022.02.14.11.40.45; Mon, 14 Feb 2022 11:40:46 -0800 (PST) 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 7678068B1B0; Mon, 14 Feb 2022 21:40:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D976D68AFEB for ; Mon, 14 Feb 2022 21:40:35 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nJhD9-00GpMG-0E for ffmpeg-devel@ffmpeg.org; Mon, 14 Feb 2022 20:40:35 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JhCAn3LVkSgGFJhCAn788X; Mon, 14 Feb 2022 20:39:35 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=9zACHkxo1Dco4ITghHYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Feb 2022 20:39:31 +0100 Message-Id: <20220214193934.22315-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJxsN5mlII1NjujWZeJ+PVELYUNGssyeAaCYx45Cu7wpsQohXB62yYf0HkzoTerI8dxZqO7RqjR4wXhNgdaUX2QSB2TpSsn1R1vQD70Bwso4QKJ92nFj 5j+TvTqRSVr0UT/v7uSAD+0to3MfqSSN6XYq/dtTTnIXcwXhjo4pa+yh Subject: [FFmpeg-devel] [PATCH 1/4] avformat/matroskadec: Check duration 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7Y0TiE2AsY/3 Fixes: -nan is outside the range of representable values of type 'long' Fixes: 44614/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-6216204841254912 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 91f3567692..8f0c53a6bc 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3065,6 +3065,8 @@ static int matroska_read_header(AVFormatContext *s) if (!matroska->time_scale) matroska->time_scale = 1000000; + if (isnan(matroska->duration)) + matroska->duration = 0; if (matroska->duration) matroska->ctx->duration = matroska->duration * matroska->time_scale * 1000 / AV_TIME_BASE; From patchwork Mon Feb 14 19:39:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34287 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5803872nkb; Mon, 14 Feb 2022 11:46:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5ajAPXP0vXlddTPV9FR4ZZCQ8n6Q2uRx+/tPF73eSS8LXniDOHbn1ZSafe8SfmnVkYFwb X-Received: by 2002:a17:906:3f45:: with SMTP id f5mr263445ejj.479.1644867979076; Mon, 14 Feb 2022 11:46:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644867979; cv=none; d=google.com; s=arc-20160816; b=tKxY0/iXON+QiiNwq/5KmW/3kqBHC9iE18TqV+l8zy9o9XwxAVCQZ0ZmTkSmYB22Mz Es8hI/gUkgWwaz1qPh83ch9W26U3dlWrjfn7UPEuWZp+xBceWNzNLgXhuyupVfjwTcml D4HkK2t4ap5L8CfXOx5q4rCfGHQDaJV4bxa1C5fTQWw96TkpWQK0Zh/kpTnp9RqH/Vt5 fqSa9gKIqjSbxrVz6H2MiNHPTzSkKVrsIiWidTX4U0NSAxNJoj+z2XdVt3T8AseNpCqg opkCHKEhjKKx0GNfQuZgY6nD7g9dfOXMeW/S+kMxGMp+35xdc4PRKnetwO+r1ne4Vntj 0Aow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Wi5REK6B85zE//1YdwWLRQ2u4XSXk3KjKf4C0wE+TOI=; b=dFFVpHhiO6Qcme189jbnBwWbWs6HDagT2b4uNm37pHlFoqujVSgmhzUCA/tYVjmalz mDCObhba5gnD2iMSsv5p4oVTfih4oUSjIkOTOrzO/mZ2LaqHnrl6cOgvdEHVK1iXu4Qy Ec9BGzzFTIBa+vZE5vvFyz6sug5P/SrOk7ydh5yAxoAtX+Ee2x/UhfWAVaxtE23pqGqd mYghe7Nh05lY8kbb+GU2kbzxuyvrK8UCZT89o0mCGuNMssTBdGRGpV0Oy5csiA82MK2l XqAGAY1dDv8VV5eRtCTL+51iHBiv80ewOy6HvnP1TP42QaKekAzN/QKJaF6HME/95knf TlXw== 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 hz5si22383185ejc.689.2022.02.14.11.46.18; Mon, 14 Feb 2022 11:46:19 -0800 (PST) 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 D69CB68B1CE; Mon, 14 Feb 2022 21:46:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77F5A68B1C7 for ; Mon, 14 Feb 2022 21:46:01 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nJhD9-00ExfG-0E for ffmpeg-devel@ffmpeg.org; Mon, 14 Feb 2022 20:40:35 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JhCBn3LXASgGFJhCBn788g; Mon, 14 Feb 2022 20:39:35 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=4qkO0-IAiEMN-s4Q6LYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Feb 2022 20:39:32 +0100 Message-Id: <20220214193934.22315-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220214193934.22315-1-michael@niedermayer.cc> References: <20220214193934.22315-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJxsN5mlII1NjujWZeJ+PVELYUNGssyeAaCYx45Cu7wpsQohXB62yYf0HkzoTerI8dxZqO7RqjR4wXhNgdaUX2QSB2TpSsn1R1vQD70Bwso4QKJ92nFj 5j+TvTqRSVr0UT/v7uSAD+0to3MfqSSN6XYq/dtTTnIXcwXhjo4pa+yh Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/movtextdec: add () to CMP() macro to avoid unexpected behavior 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VtqIIRtq55EO Signed-off-by: Michael Niedermayer --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 825632ca9b..dc30fdc698 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -263,7 +263,7 @@ static int decode_hclr(const uint8_t *tsmb, MovTextContext *m, uint64_t size) static int styles_equivalent(const StyleBox *a, const StyleBox *b) { -#define CMP(field) a->field == b->field +#define CMP(field) ((a)->field == (b)->field) return CMP(bold) && CMP(italic) && CMP(underline) && CMP(color) && CMP(alpha) && CMP(fontsize) && CMP(font_id); #undef CMP From patchwork Mon Feb 14 19:39:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34286 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5803775nkb; Mon, 14 Feb 2022 11:46:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzo6vG13hrBYM8PuymtujVuf05Sfa1SvOI1VV6CEABZOyQiNmJ2A68LkIpD4iWZx19JAjvM X-Received: by 2002:a17:906:1e0e:: with SMTP id g14mr275585ejj.363.1644867969625; Mon, 14 Feb 2022 11:46:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644867969; cv=none; d=google.com; s=arc-20160816; b=ojhyF7swAasFzYYS9w5HSXpbcr5XnLXvwMWGAurOTPVkyHcCJR25E2Wq9YXWPfL/Gc krmdfi08iAN2RJ8Mg3g3xE4yvZ5oitz7/HdIsprwOjDgICMzD6jzs+WGt/XrJxqU0awH q/2Els5Af2nWtA9OIRgp0TPA85gFuOTmd/ezJlFr4xdrj5Qe9yxyVwuk1ya70rmAzfPc GvZjZNaHXSiRKinE2XZCNV5tpBL7D/fuZ4ZjQ5xFGdINhb/qucNo2xTsAkakzRe7vgjZ tW9Fp//XPm6Y0xNdEGmQmYNC77+tv+H98aylqSvvQy9S6fZBbQxvY5ll3oqedrtTWwYa kWCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=DNMZ/VPkIKoCVfxmfiyn9Bpn92ByRnq/LPktUdepwrc=; b=y/s0GaxmCgTKlydRsqH+oS4hytyr4vTXFJI+71maGivv1XRkBkjxvFb/JZYw026lMa aE480qdaQLPVeFC/IGL1TMMg99BIv9EjLAqgXqa2RGZ9LDpxUB0glU6aMfIc04WUPUl3 S+YbYnhjzvVyiEAfBLx+UHe0/F7OXCh4IsK6ys/qFJZ1IZw8Fv/o8wMlsBEQJZ5aK+LZ NY+gwBJWjiZhZBdAwe3q6pYHpz9VHLkDnGeWZBsSvl/4YfxGAKUok1+EOGcSwm0rrbOG sR5+L0PVQw6DuwSMD03+QirSJY3sJABS/dMR+WQE9BujLEzF25l3b25cyO73goUvKphK DbHg== 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 hg7si7175716ejc.935.2022.02.14.11.46.09; Mon, 14 Feb 2022 11:46:09 -0800 (PST) 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 CD0F268B1BC; Mon, 14 Feb 2022 21:46:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B1E668AA61 for ; Mon, 14 Feb 2022 21:45:59 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nJhD9-0085kg-0F for ffmpeg-devel@ffmpeg.org; Mon, 14 Feb 2022 20:40:35 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JhCBn3LXUSgGFJhCBn788j; Mon, 14 Feb 2022 20:39:35 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=9fOdc6Alh6yYiEY7:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=0FiIzqYPJijAINhMhaAA:9 a=i1O-c8UAq6sOuJHIsowk:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Feb 2022 20:39:33 +0100 Message-Id: <20220214193934.22315-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220214193934.22315-1-michael@niedermayer.cc> References: <20220214193934.22315-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJxsN5mlII1NjujWZeJ+PVELYUNGssyeAaCYx45Cu7wpsQohXB62yYf0HkzoTerI8dxZqO7RqjR4wXhNgdaUX2QSB2TpSsn1R1vQD70Bwso4QKJ92nFj 5j+TvTqRSVr0UT/v7uSAD+0to3MfqSSN6XYq/dtTTnIXcwXhjo4pa+yh Subject: [FFmpeg-devel] [PATCH 3/4] avformat/argo_asf: Fix order of operations in error check in argo_asf_write_trailer() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w+Vl5i7FTBd8 Signed-off-by: Michael Niedermayer --- libavformat/argo_asf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 2b3569ebc3..d26844d1e2 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -423,7 +423,7 @@ static int argo_asf_write_trailer(AVFormatContext *s) ArgoASFMuxContext *ctx = s->priv_data; int64_t ret; - if ((ret = avio_seek(s->pb, ASF_FILE_HEADER_SIZE, SEEK_SET) < 0)) + if ((ret = avio_seek(s->pb, ASF_FILE_HEADER_SIZE, SEEK_SET)) < 0) return ret; avio_wl32(s->pb, (uint32_t)ctx->nb_blocks); From patchwork Mon Feb 14 19:39:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34288 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5803986nkb; Mon, 14 Feb 2022 11:46:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNNYYU0U7ci2gRVPg75BqnD/AF0edNS4P/PwytFTiR0EOEUNfoUMFShv7aXa0vx+T/FIlD X-Received: by 2002:aa7:cb8c:: with SMTP id r12mr422808edt.164.1644867988564; Mon, 14 Feb 2022 11:46:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644867988; cv=none; d=google.com; s=arc-20160816; b=TNoCdYFm3FC+uuS7KPlONcmSi8iI28xaTtYvi80C1sYJhEdr3xrtgmfaBgz8T4ZBql jDa0om8bd4NY2AUtFBmLwGINtPBco7vfHo0xzYSe40LfqmtQD82uhrdxtstW0ALBOmOs K42HB8W1tn2u3gM3zGkyBtsl/1q2hmcIDWqe1NweBVP0xP1wOTr2efq5Los4S+e7Zp7i S7aE68v4lHftIurlUKpHPVFkmuTNeHATYT1p9EYeK1F32+uLg63IhFR5Mx46v/ZKUpCj 5teqlqPfGhDqJlO0mFjQX3/PIidVF4N9m5Tx3V3cuBLPWkBVFB97W5Vc7vn03ooKVRnH rOcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Fsh50lB8qJjzju/67BcjyNv0MyY32XnCVlU0xiyzUsI=; b=Q8DuD4irRAm2kJMRRgFJbYRNKJ50/y9aKxPAL5eacxrG3eXvKCdOra+10rYIDzjB+d EwbxDXxDoTfNvIZLedsDyKcrQ/6KoGUO4Y/dkkDP/bJGOi8IJhG8QGZ1lcnpygMJmyrg zQQCvD/yOnXhrmNvfSS/hsNe7yqlM+LJtmAj2EUuThBmSVTz5iUF68y+dFeTp4miGcZV DfG+b3D9mZuVbJMoEdpGq9I5DjOdZmLsQo5ttgDSBRDD53HVYO/ZRkNtRt+a4m+Xz8tN dQihpSJFx3cGrGwNZcDdmIA5nbkYooY7YJWtZE3YK16YboYLXsoZM1gxheFas2Q/qCLM p1hQ== 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 4si20381779ejh.124.2022.02.14.11.46.28; Mon, 14 Feb 2022 11:46:28 -0800 (PST) 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 F096468B187; Mon, 14 Feb 2022 21:46:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E378A68B1C8 for ; Mon, 14 Feb 2022 21:46:04 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nJhD9-0085kM-0E for ffmpeg-devel@ffmpeg.org; Mon, 14 Feb 2022 20:40:35 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id JhCBn3LXmSgGFJhCBn788m; Mon, 14 Feb 2022 20:39:35 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=9fOdc6Alh6yYiEY7:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=QBzWbua37OAYYnBzN0IA:9 a=i1O-c8UAq6sOuJHIsowk:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 Feb 2022 20:39:34 +0100 Message-Id: <20220214193934.22315-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220214193934.22315-1-michael@niedermayer.cc> References: <20220214193934.22315-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJxsN5mlII1NjujWZeJ+PVELYUNGssyeAaCYx45Cu7wpsQohXB62yYf0HkzoTerI8dxZqO7RqjR4wXhNgdaUX2QSB2TpSsn1R1vQD70Bwso4QKJ92nFj 5j+TvTqRSVr0UT/v7uSAD+0to3MfqSSN6XYq/dtTTnIXcwXhjo4pa+yh Subject: [FFmpeg-devel] [PATCH 4/4] avformat/argo_cvg:: Fix order of operations in error check in argo_cvg_write_trailer() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1CMbRNWM5qyn Signed-off-by: Michael Niedermayer --- libavformat/argo_cvg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index e1854b4493..c5da32536d 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -350,7 +350,7 @@ static int argo_cvg_write_trailer(AVFormatContext *s) */ avio_wl32(s->pb, ctx->checksum); - if ((ret = avio_seek(s->pb, 0, SEEK_SET) < 0)) + if ((ret = avio_seek(s->pb, 0, SEEK_SET)) < 0) return ret; avio_wl32(s->pb, (uint32_t)ctx->size);