From patchwork Tue Jul 19 23:34:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36850 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2064507pzb; Tue, 19 Jul 2022 16:34:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sVa/CBlgKzNd3JXO+Tl++NGlxYuOY9Md1ovISgvoZttfCznKyj0SQQoGO3fnRW+L8sYltG X-Received: by 2002:a17:907:a06f:b0:72b:564c:465b with SMTP id ia15-20020a170907a06f00b0072b564c465bmr32387244ejc.344.1658273681739; Tue, 19 Jul 2022 16:34:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658273681; cv=none; d=google.com; s=arc-20160816; b=vWZaEBjrY31YWdYfuJMs9INyNAqBX4KNN3KGcyYpwUQS+Ri58GbcGcgFyKRVEM/I46 zx2PJdcp4c1pVytNOjC1V64CiG7SQ/F0MBe60hmnGDWBL3TeCC/8fZ5wW/KZ3mnb+Id9 Zgk+RXyFp12HlK81S8jynGHTan8okEsRjKk8JQey+Q4AsZQKOGLl0dCg2V1/VgWAV5Pv 0Suj92TD2VB51GsHfTjiiQM2zSQGMtx+9PGtT0hPsLJhZg/ZYI3P9sQmxojb3IVOrLmE 4A3GmG+uRjB4FgD4KCOBse3MSmnvhqmTUeIA1p2PqwgRjxu05Qrx10xtqBNocdgmuJP6 VB8A== 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=g4f6dRCk9RBgmeykYrZl+SN2Uk9VFPviKhxPtIveqCA=; b=FqGrH2JI1V6TZVvFhYJceMgCgUY+tGMX/5Iek1W7z7zwvNAsGd17ZOm3ya1sMvF0Au 43oIF/XrjV/rOHxfA7ve2xWZ0xWp5ly0Plc8v1jC0kLZmPOFa0XNJ3oquw6UL5Yajl71 Z5g4RI3ixx3IQipznrt+/HhHEZsJ4JJDoeBh+oyrYnq+eiLqkNbJLJZa/PhTQqAWt1HJ 2FZesq27czzhdFAWexKLFi4ctz+onIcobCmyO1DGHjrCReNiCqmsGwtxtW4AjCEAz3gy cN6bIoSmqaTtZe1KeM/ApOfLDbbkGPJsi5hcrPx9TkVMsyeDHk8U6hTthAVPiztfHNMU N6AQ== 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 du18-20020a17090772d200b0072aebf9cc60si22036071ejc.619.2022.07.19.16.34.41; Tue, 19 Jul 2022 16:34:41 -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; 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 213C068AF2A; Wed, 20 Jul 2022 02:34:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-1.mx.upcmail.net (unknown [62.179.121.148]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3090768B419 for ; Wed, 20 Jul 2022 02:34:22 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oDwjM-007ssM-Q8 for ffmpeg-devel@ffmpeg.org; Wed, 20 Jul 2022 01:34:20 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id DwjMo3TNi8s8UDwjMoYTNI; Wed, 20 Jul 2022 01:34:20 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id DwjLod1SxOPqFDwjLoeMha; Wed, 20 Jul 2022 01:34:20 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62d73f7c a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=qX5wZS9MHFB6eZLz2DQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 20 Jul 2022 01:34:18 +0200 Message-Id: <20220719233419.17185-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfFaFISCSTnKqif0AiafP148+uEc+6iDQNXWdC7lUkXeNuOm06o4WqoQpAlAstX4VgkIG3vWIhUtENNs10tscFa+I83MfzEUzGS1LHXju+3YEFAG0nPYi yWxur+JU/7HXdUnenetD1scStG/HLErjRmAkFrhrMVE6UjzzeINM8Vs+j0rYQEJcHh0HuwZlXMuVcw== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: Check for EOF in mov_read_iloc() 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: Pt9JBhNTpDSM Fixes: Timeout Fixes: 49216/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6563000529584128 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 14550e6456..a09a762d91 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7555,6 +7555,8 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (int i = 0; i < item_count; i++) { int item_id = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; if (version > 0) avio_rb16(pb); // construction_method. avio_rb16(pb); // data_reference_index. From patchwork Tue Jul 19 23:34:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2064454pzb; Tue, 19 Jul 2022 16:34:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sVGaKLQ7CahlY2K9PpExWBHIwjCJTRtFeDf8rmFXtXF+3he2sNGHmofyWeYAz+73Ib6iSC X-Received: by 2002:a17:907:2705:b0:72b:4ef4:2d91 with SMTP id w5-20020a170907270500b0072b4ef42d91mr32454052ejk.95.1658273672413; Tue, 19 Jul 2022 16:34:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658273672; cv=none; d=google.com; s=arc-20160816; b=TTU+GqFuBvkS2fT76i8iU6eCIRD6taRy2IDfQvm3+vjwu+M9bAh7uTlZm6xO/JcqID hAK2dvitvPf5sQCesPhZN7XQCkSE6MxEouILiCuQfsl9X3ROmimzmVl1WcxyfqewPHIh SBT/2Ib47nIzO57js/G+aNwNLdnICQMRm7lSI2qHoZDaB16P/HSDStSP3+d4rk40ZHje t33PfsKayy/64OLMHsQFysGUkh2q0FktPsqyCFmgUq16cqyPEeboHao/Gyh9rPe7JI6d j44HjZxiM2h37Tmj5UML/CNCMj1Wai5+JNqW3Z4FZh8IFq54Mxo/LHLgQ9qQMIFt1z2Z K2wQ== 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=H3YE626NjPnymc/JzJ8pxKORNs8z5DRFSrOxGfQnB4E=; b=z9C8qCCWfRvlj1RSnsP9SZO5apoL3yQy8ydeEy0Oc3R9NU2+DyttHSe3mUE7pGTOYO RlkXrLvONZ8mO5qTkvcv9LIHkEA1YGjq0BxwoEf0zSZzOMzRStMw3BNVaFqyZveZPGDX H1rlUK3TO3uPpcvt6p36juDvx6ymJ2qOSTg7uJOzokTwVfD7c7GQoXAInMlmJU7a8svb YQhvvonc0il4QAI8JUdkY9YlNF5aE9bJET7koRTLKOTkZyNT6rC24POsWeU8kXlXf2di 3559GLrkPsPGFQYGIdoi/FX1d3W1WLBBIcHN5IJKSqWZZGeo35KfIrZWBTxkzLA9rfZ8 dMbg== 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 t2-20020a1709063e4200b00726bd755998si16553241eji.967.2022.07.19.16.34.31; Tue, 19 Jul 2022 16:34:32 -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; 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 D6F0068B6CC; Wed, 20 Jul 2022 02:34:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7402668B419 for ; Wed, 20 Jul 2022 02:34:21 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oDwjM-00G5qI-R0 for ffmpeg-devel@ffmpeg.org; Wed, 20 Jul 2022 01:34:20 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Dwj4o3T6w8s8UDwjMoYTNN; Wed, 20 Jul 2022 01:34:20 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id DwjMoyNCy8eSWDwjMoBdBi; Wed, 20 Jul 2022 01:34:20 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62d73f7c a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=BHJfzmVVFyA3L1QO8dIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 20 Jul 2022 01:34:19 +0200 Message-Id: <20220719233419.17185-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719233419.17185-1-michael@niedermayer.cc> References: <20220719233419.17185-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfFaFISCSTnKqif0AiafP148+uEc+6iDQNXWdC7lUkXeNtiisrVcVgEdB+OwHxnAKe0Bedsp1qQZYNc2M/uCG8YycMQSyoRE2+2STQgEAf3+N4qbN+Wso z0V8DcWrisRtiof/Xw9P+IzA3rLKDCOJALWZWO0YWuH92I+Tn5hZswfSmxY/cHZtRXM78uV9MlpWJA== Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hdrdec: lines can be empty 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: W6Giy1YqYCgF Fixes: infinite loop Fixes: 49223/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HDR_fuzzer-6603308596330496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hdrdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hdrdec.c b/libavcodec/hdrdec.c index 458215c6ac..29e87057fa 100644 --- a/libavcodec/hdrdec.c +++ b/libavcodec/hdrdec.c @@ -107,7 +107,7 @@ static int hdr_decode_frame(AVCodecContext *avctx, AVFrame *p, hdr_get_line(&gb, line, sizeof(line)); if (sscanf(line, "PIXASPECT=%f\n", &sar) == 1) avctx->sample_aspect_ratio = p->sample_aspect_ratio = av_inv_q(av_d2q(sar, 4096)); - } while (line[0] != '\n'); + } while (line[0] != '\n' && line[0]); hdr_get_line(&gb, line, sizeof(line)); if (sscanf(line, "-Y %d +X %d\n", &height, &width) == 2) {