From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 742BB40BFC for ; Tue, 7 Jun 2022 09:06:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23A3768B4A1; Tue, 7 Jun 2022 12:06:11 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7498B68B471 for ; Tue, 7 Jun 2022 12:06:04 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3DD56240175; Tue, 7 Jun 2022 11:06:03 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 3UGwJV3s9IpL; Tue, 7 Jun 2022 11:05:58 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C85C92400F5; Tue, 7 Jun 2022 11:05:58 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 0BFBE1601B2; Tue, 7 Jun 2022 11:05:59 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220604103507.1822192-1-mvanb1@gmail.com> References: <20220604103507.1822192-1-mvanb1@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches , Martijn van Beurden Date: Tue, 07 Jun 2022 11:05:59 +0200 Message-ID: <165459275900.13099.10229209400339279555@lain> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2 1/2] avformat/cafdec: Implement FLAC-in-CAF parsing 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: Martijn van Beurden Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting Martijn van Beurden (2022-06-04 12:35:06) > @@ -170,6 +171,49 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) > } > avio_skip(pb, size - ALAC_NEW_KUKI); > } > + } else if (st->codecpar->codec_id == AV_CODEC_ID_FLAC) { > + int last, type, flac_metadata_size; > + uint8_t buf[4]; > + /* The magic cookie format for FLAC consists mostly of an mp4 dfLa atom. */ > + if (size < (16 + FLAC_STREAMINFO_SIZE)) { > + av_log(s, AV_LOG_ERROR, "invalid FLAC magic cookie\n"); > + return AVERROR_INVALIDDATA; > + } > + /* Check cookie version. */ > + if (avio_r8(pb) != 0) { > + av_log(s, AV_LOG_ERROR, "unknown FLAC magic cookie\n"); > + return AVERROR_INVALIDDATA; > + } > + avio_rb24(pb); /* Flags */ > + /* read dfLa fourcc */ > + if (avio_read(pb, buf, 4) != 4) { > + av_log(s, AV_LOG_ERROR, "failed to read FLAC magic cookie\n"); > + return AVERROR_INVALIDDATA; Should probably forward the IO error with something like return (pb->error < 0 ? pb->error : AVERROR_INVALIDDATA); same below and in the second patch -- Anton Khirnov _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".