From patchwork Sat Jun 18 20:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp825081pzb; Sat, 18 Jun 2022 13:03:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sUENBd6BatAUBob7bZWA3usKtlY+gExu2TGg0BFLYAUlZmjGU81v60QfWLiWNvikVtefxz X-Received: by 2002:a05:6402:201:b0:431:665f:11f1 with SMTP id t1-20020a056402020100b00431665f11f1mr20333333edv.378.1655582606883; Sat, 18 Jun 2022 13:03:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655582606; cv=none; d=google.com; s=arc-20160816; b=FLqDL+1mdcGs7f6D5avq4XI1m/fSgAeTcQSan0JmOjGIryHLsEpTVTkVomkVlT9Ytq RWAbsTE+2ofTQkZ27MdGODleQS2OqfdpYiL7cIIOTqj6qIqs7PXFzdQW1iEzvclcMmsb m4UCHrfhhpscgSGiILOIFrTNw1JX53XUUYSOrfegV9B2vIQScWVxBJyQ99AEIvjXD8ZO C+gBfBkcz+f1fu+HJLOjBFhUd1S4CyGbvPn2JhDjcDT+4f9TDCVVk7yqMxnEampbLCeM VCt1biCfjPI6j0rorRErDEnztx56Ksd52prauyxtNiOPSV/f1zhkZm0jAIrD3a4C2wjn QGGA== 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=qFZxkm32VdTqpggHGoZRO3qkjDB/y3fBPUjYVoKrRIY=; b=If5nkJ/xVEJR+wHPdFbbUip8f91L1ykqtqRQ6JTZKut4JEcX3oZO8dxBhubHVsio37 Fp7DtyCNlTlz9JadsybcawlStovb1EVSYqnSbXXkLwq03kzITiZ3LR+ZoxOOchg195dc w9EjMpd7fJih2vXffCrCiTRP/Fwvv7BPI3XBTouh58XWIJD7hh7/MYUvoKxO9KcVp67+ Zzn8wGq93QxLdep0+IUTK9Ud719tWPRXbPxslv7nz2rxflH3rDLwToi1yIuDhJPWNUNu KEDFPWtPKs8V2PuZFEDUMQI24x5u8+N7/2SLVcg51eqV2mA5Xsooyrk295RmMiQ0b5uB oyYw== 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 v13-20020a50f08d000000b0042dcbb47403si4521135edl.116.2022.06.18.13.03.25; Sat, 18 Jun 2022 13:03:26 -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 1136A68B4E4; Sat, 18 Jun 2022 23:03:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1080268B415 for ; Sat, 18 Jun 2022 23:03:05 +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 1o2eeu-0000EI-5D for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 22:03:04 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2eeXoZnMP8s8U2eetolqvG; Sat, 18 Jun 2022 22:03:03 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 2eetongLk8eSW2eetoUOzJ; Sat, 18 Jun 2022 22:03:03 +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=62ae2f77 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=e7X-CqB84J0Fa-SPJ20A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jun 2022 22:03:00 +0200 Message-Id: <20220618200303.17054-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNCC2MwsRurECCjzTRhZ1Lw+8vUlVZ3RRvEuU0pdBzIibrivJwXzeG5yyrlQOaaJWU2wzbP02dWvUjApVgQ57HAtzDC+z5T9feYblBXg2jcbpF+CELQm ZScgefdLaG+vXh4COkpGDiADfWrQ1dzHa96IAjt1V+RQuy0fcPaDhctUgDld5iOov1V2Zxjec3wRpw== Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: Avoid cloning encryption info if its unchanged 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: PB5V8Ys6rnmG Fixes: OOM Fixes: 45834/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5419540462305280 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3ec0ea2361..c93e13c8cd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6187,9 +6187,12 @@ static int mov_read_sample_encryption_info(MOVContext *c, AVIOContext *pb, MOVSt return AVERROR_INVALIDDATA; } - *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); - if (!*sample) - return AVERROR(ENOMEM); + if (sc->cenc.per_sample_iv_size || use_subsamples) { + *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); + if (!*sample) + return AVERROR(ENOMEM); + } else + *sample = NULL; if (sc->cenc.per_sample_iv_size != 0) { if ((ret = ffio_read_size(pb, (*sample)->iv, sc->cenc.per_sample_iv_size)) < 0) { @@ -7120,6 +7123,8 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa } else if (encrypted_index >= 0 && encrypted_index < encryption_index->nb_encrypted_samples) { // Per-sample setting override. encrypted_sample = encryption_index->encrypted_samples[encrypted_index]; + if (!encrypted_sample) + encrypted_sample = sc->cenc.default_encrypted_sample; } else { av_log(mov->fc, AV_LOG_ERROR, "Incorrect number of samples in encryption info\n"); return AVERROR_INVALIDDATA; From patchwork Sat Jun 18 20:03:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp825442pzb; Sat, 18 Jun 2022 13:04:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sMjHVE/Im5WLU+n/o3TG+gM9eiOKSw2MLJlen7eDiQafrSeIfM6K7bZJm1c2bKbMBuO8F9 X-Received: by 2002:a17:906:685:b0:6fa:8e17:e9b5 with SMTP id u5-20020a170906068500b006fa8e17e9b5mr15237409ejb.522.1655582653314; Sat, 18 Jun 2022 13:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655582653; cv=none; d=google.com; s=arc-20160816; b=B446eyUt2wanJTOcq9K7banu05lRs+anzvBmvYyd1VgQTu/FKTzY4CRrGkl6345Jww GVc2EVdx+2vtj7cXnu+t8Hb1+Bx7x+0Kiq6XYc8cLrczUzxhhFPKsvxOHDQAcaekgEuV ie8R07LeBYYchjMIqYq8r30WtxtFqb+d8nAySJpibetlCaB3BYi66oGnR3ixYY8Zq53b 6/dwbW8DPLd5vrEOMrAovRAjpNSDjsKFaQLYALCwaTUatlV+RZoLEjdUePlr7rUr+FAM yFUFG2SKGDaa/mDTvsdzKcafZsg+8Ev89TTf97cBhuwRlexTE+3p1Rq58a1Hx2pshqml wYxQ== 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=8KvF8wngkc7vG2B4sv27uXF3/Obdk8aN815OgeiBBQI=; b=QU3Qe5KvYPh5uawoDXcS9sQPODmG/4kmUdZ0INc6l/5rRSggewsoY7w1XNuhXhOp67 KOlW7OgwDm/4uHXVpBtwyM6+DLgHrS/r9O+AqbqcaLJPhmoRUsn16ZpwMKizvXna9QoU /bvLvHZx9Qp8KbVq2/jpFVDMQA0baZP/W31pcIrRW+vIkC9G/b+92Nm0nAAyBOEA+0uA ndMt/sAuMvqDZcknSExwij1l+hH+7nsbTZaI+FOOxK5yf08Z5l8ikIF1SCTlGOy0CO5j gQD6RpJd0nBjdPTxTOqFZ3heqrAQYVd6jRekHnpLuViW8s7Kgd1IfQu5Ta04rjPqBPmE v+HQ== 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 i28-20020a0564020f1c00b0043566d1a4d5si4109655eda.264.2022.06.18.13.04.13; Sat, 18 Jun 2022 13:04:13 -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 214E068B295; Sat, 18 Jun 2022 23:04:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9AC768B295 for ; Sat, 18 Jun 2022 23:04:04 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o2efs-002X7E-7k for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 22:04:04 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2efNoZsxW8s8U2efsolw9D; Sat, 18 Jun 2022 22:04:04 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id 2eetongM28eSW2eetoUOzL; Sat, 18 Jun 2022 22:03:04 +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=62ae2f78 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=D2vUUIruARFot66U00kA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jun 2022 22:03:01 +0200 Message-Id: <20220618200303.17054-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220618200303.17054-1-michael@niedermayer.cc> References: <20220618200303.17054-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfISJ+y7LOOvwpqAv0OY1izAMuNF/ktabQMcvBwmp1Abflxp1/1qpuKlZzicTMWbl/DwWwREP3LpwRkBhB1P85GsRt+6MRLLHGph1NpT+caNjk803DQVW /L8AP9aVomXzDtWsJalFKO92cI+TB9n19SvRgVrbZlbU2Kjw1xFyE6H7RwvbqLIY3HEeXYz4xjZNBg== Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mov: Add special case for slow duplication loop in mov_read_trun() 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: YgzsUoY4Y+rz This extra code is ugly, better solution is welcome Fixes: Timeout Fixes: 45700/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6141847792123904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index c93e13c8cd..3d9e866d4e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5092,6 +5092,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (index_entry_pos > 0) prev_dts = sti->index_entries[index_entry_pos-1].timestamp; + if (flags & 0xF00) { for (i = 0; i < entries && !pb->eof_reached; i++) { unsigned sample_size = frag->size; int sample_flags = i ? frag->flags : first_sample_flags; @@ -5166,6 +5167,74 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->nb_frames_for_fps ++; } } + } else { + unsigned sample_size = frag->size; + unsigned sample_duration = frag->duration; + + if (pts != AV_NOPTS_VALUE) { + dts = pts - sc->dts_shift - sc->time_offset; + av_log(c->fc, AV_LOG_DEBUG, + "pts %"PRId64" calculated dts %"PRId64 + " sc->dts_shift %d ctts.duration %d" + " sc->time_offset %"PRId64 + " flags & MOV_TRUN_SAMPLE_CTS %d\n", + pts, dts, + sc->dts_shift, 0, + sc->time_offset, 0); + } + + if (av_sat_add64(dts, sample_duration * entries) != dts + (uint64_t)sample_duration * entries) + return AVERROR_INVALIDDATA; + + for (i = 0; i < entries && !pb->eof_reached; i++) { + int sample_flags = i ? frag->flags : first_sample_flags; + int keyframe = 0; + int index_entry_flags = 0; + + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) + keyframe = 1; + else + keyframe = + !(sample_flags & (MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC | + MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES)); + if (keyframe) { + distance = 0; + index_entry_flags |= AVINDEX_KEYFRAME; + } + // Fragments can overlap in time. Discard overlapping frames after + // decoding. + if (prev_dts >= dts) + index_entry_flags |= AVINDEX_DISCARD_FRAME; + + sti->index_entries[index_entry_pos].pos = offset; + sti->index_entries[index_entry_pos].timestamp = dts; + sti->index_entries[index_entry_pos].size = sample_size; + sti->index_entries[index_entry_pos].min_distance = distance; + sti->index_entries[index_entry_pos].flags = index_entry_flags; + + sc->ctts_data[index_entry_pos].count = 1; + sc->ctts_data[index_entry_pos].duration = 0; + index_entry_pos++; + + av_log(c->fc, AV_LOG_TRACE, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", " + "size %u, distance %d, keyframe %d\n", st->index, + index_entry_pos, offset, dts, sample_size, distance, keyframe); + distance++; + dts += sample_duration; + offset += sample_size; + sc->data_size += sample_size; + + if (sample_duration <= INT64_MAX - sc->duration_for_fps && + 1 <= INT_MAX - sc->nb_frames_for_fps + ) { + sc->duration_for_fps += sample_duration; + sc->nb_frames_for_fps ++; + } + } + + } + + if (frag_stream_info) frag_stream_info->next_trun_dts = dts + sc->time_offset; if (i < entries) { From patchwork Sat Jun 18 20:03:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp824997pzb; Sat, 18 Jun 2022 13:03:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s2mnqGeYOrxPD9WtEl6EXkXy0AanHQzYcvcULjatyawUGl/bcnYX1n4h25SUGd9jir3tT0 X-Received: by 2002:a17:906:33cc:b0:711:609f:8a63 with SMTP id w12-20020a17090633cc00b00711609f8a63mr14820593eja.128.1655582597773; Sat, 18 Jun 2022 13:03:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655582597; cv=none; d=google.com; s=arc-20160816; b=S2NZCRK3DaymB+g4sYFBiRrTg9gSxR3FnL7OGYuYN3npJc+kx9o65soOV5SK4TEPLp 7caQGKh0ip6N6v+76rgRCiOZHARm3AD3IN/PNdSswKNBNLA+YlJG9wBGEv+RztDaOCf8 kcpT3/HB18+g7cMpLbKJZ1qwgCBon4K3df7QwfGmwxRcKfsxHmIQDuBfo0+1972b8npu gAEwadUvkdc9BDaZObCHkadIkE8Nrw4BWQ/3KFH3K4zqgIALRQDRkRoYMsY6U5+rszIj BKoq4W2ulYlCJtZAjMjGMiTanwLgnZKjaAMZyt8l9srFzKKyKssEwcSkyBqrZdacD+4+ yjug== 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=ngLJGDNXqAMH0oB8XbnYqX5v6tYi7yfb7fTp//3xZR0=; b=B8KeNL0ExYJmm3f/fxXVaN4x3/RrufcDJeZAsTymI1md5BoLwF/dTyv5ixATKRoHMK IXfCbSl1Hidggd+QLT/qG8oUCtYGhFw1s42wdECfTlXyGPA0XOhILuD2PTfRa2nwcZY4 J2vW57ilOka7WTO435BHF9OdW01FTohUGPQDQEoEC55mGo/QrqF3x2gmFbPEUQfBxe83 5WXJU4ndLsBqat05Gs76MnLbWrtNsEvICqkJE2r5+HCHbd/Q4oYDcdOL9U6o3qIEj1dk pyu8+iclOErrS89QMyGrvtLJJV1sO7XnUekzgQcfdzO/NfQT+l4mXpDuaGDwRmBh/VVF B02A== 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 gs20-20020a1709072d1400b0070f1426c37asi9498074ejc.464.2022.06.18.13.03.15; Sat, 18 Jun 2022 13:03:17 -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 ECF6968B4FD; Sat, 18 Jun 2022 23:03:11 +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 0F10568B2B5 for ; Sat, 18 Jun 2022 23:03:05 +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 1o2eeu-0078Ll-8C for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 22:03:04 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2eehoZoK38s8U2eeuolqy8; Sat, 18 Jun 2022 22:03:04 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 2eeuodpdUOPqF2eeuoqyeM; Sat, 18 Jun 2022 22:03:04 +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=62ae2f78 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=V14U3VdKKzpFb2B2f9wA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jun 2022 22:03:02 +0200 Message-Id: <20220618200303.17054-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220618200303.17054-1-michael@niedermayer.cc> References: <20220618200303.17054-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNCC2MwsRurECCjzTRhZ1Lw+8vUlVZ3RRvEuU0pdBzIicAwsaSpM8ze6mtzVRh2e3SNnRiIlU4zDEFQEdBCiULGTLU2vSMFwWjxNLFUzrp4rveibcr0O mxe77xC4d30E4qyu4AUOJk/1nmF5hF96AMc+ESvFZhboYFdoZHKIrf/t3CwIpmlYzSuM5/sGfLrsGQ== Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/aasc: Fix indention 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: mYYngzc2GMoS Signed-off-by: Michael Niedermayer --- libavcodec/aasc.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index d297cfad76..528ee58cdf 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -104,26 +104,26 @@ static int aasc_decode_frame(AVCodecContext *avctx, AVFrame *rframe, ff_msrle_decode(avctx, s->frame, 8, &s->gb); break; case MKTAG('A', 'A', 'S', 'C'): - switch (compr) { - case 0: - stride = (avctx->width * psize + psize) & ~psize; - if (buf_size < stride * avctx->height) + switch (compr) { + case 0: + stride = (avctx->width * psize + psize) & ~psize; + if (buf_size < stride * avctx->height) + return AVERROR_INVALIDDATA; + for (i = avctx->height - 1; i >= 0; i--) { + memcpy(s->frame->data[0] + i * s->frame->linesize[0], buf, avctx->width * psize); + buf += stride; + buf_size -= stride; + } + break; + case 1: + bytestream2_init(&s->gb, buf, buf_size); + ff_msrle_decode(avctx, s->frame, 8, &s->gb); + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); return AVERROR_INVALIDDATA; - for (i = avctx->height - 1; i >= 0; i--) { - memcpy(s->frame->data[0] + i * s->frame->linesize[0], buf, avctx->width * psize); - buf += stride; - buf_size -= stride; } break; - case 1: - bytestream2_init(&s->gb, buf, buf_size); - ff_msrle_decode(avctx, s->frame, 8, &s->gb); - break; - default: - av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); - return AVERROR_INVALIDDATA; - } - break; default: av_log(avctx, AV_LOG_ERROR, "Unknown FourCC: %X\n", avctx->codec_tag); return -1; From patchwork Sat Jun 18 20:03:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36326 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp825155pzb; Sat, 18 Jun 2022 13:03:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vpKul3CBSJpjIKgeQiloZGm5QI5d46XMu6E83ZnvxZys3OCkECBK8AXbfsaCBrecTKzlEu X-Received: by 2002:aa7:d38e:0:b0:435:6785:66d1 with SMTP id x14-20020aa7d38e000000b00435678566d1mr8496751edq.393.1655582614259; Sat, 18 Jun 2022 13:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655582614; cv=none; d=google.com; s=arc-20160816; b=Zj0ytgz9TAgMME9fAU1lP+c01splDeraP9hX/CkB8P9LeDpuNmNscdhZkf5EnovG/+ APueQboxrJgLnvygU1Z/tO5enti5p6SokZGt6qLd/ZIIHwt2dYnCP+kBBC4VraMPeLxx evmHuBAe81+5lnLTf8mC2Kfn+2jwezxCNqc0JB+4Q5qwmihTQyOmpolKVkZjmS9Ltf3i sb+5i/tP1UpA65qzCfandBdM5ncz9gbWUGxCWcfKINuyamZM7mm4+t4vhIzjgqtb2KG3 1zUNrRuivGmiAjjNT9IoavGO0t3peL1nQmhrmD0nqG2+ckpqSFOo7YbniGcq2RYfeB9q Bpjg== 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=pjMU6PlxaFwQBVrUD21sqS4MoaQ8GNf4VlOjp26/J3c=; b=uda++gmsIBxfoN5OtKWiWsBysGgSjz6bHgoP3toYysHB71MAZFtGIxMAAloHXlT7fQ 8sv7t9pB3GJXbnHkUrglEcSYSJF8qAZ+cunRWtJku/9inW/KjKpe2ey7HZvau6N2E7Qh EV50ZdFXNLI5knIFy9I137IGON92U4l0XVy9LcH1dNJmtJKwoQUjCM01WXptGiSXi7eN 8EAMFEbQ1fMY8Lt5MjK/2RtEp+B3aY/9QSdoWzAruq0qxJ4YRzIoSA5Q1dsDOB07f8Yd ht7n340Ncdw+lfASVV65Au8WSwGt46FgNF/vDv4588O4VQSAQnbXKv4BhBOWydD6jU3k yyDg== 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 f26-20020a170906739a00b0071578c9dfb7si8525964ejl.213.2022.06.18.13.03.33; Sat, 18 Jun 2022 13:03:34 -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 150BF68B583; Sat, 18 Jun 2022 23:03:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 412BC68B415 for ; Sat, 18 Jun 2022 23:03:05 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o2eeu-002X7E-Dt for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 22:03:04 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2eehoZoK28s8U2eeuolqz4; Sat, 18 Jun 2022 22:03:04 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 2eeuodpdZOPqF2eeuoqyeN; Sat, 18 Jun 2022 22:03:04 +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=62ae2f78 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=_k1uZxGJMBGsTXKrwl8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jun 2022 22:03:03 +0200 Message-Id: <20220618200303.17054-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220618200303.17054-1-michael@niedermayer.cc> References: <20220618200303.17054-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNCC2MwsRurECCjzTRhZ1Lw+8vUlVZ3RRvEuU0pdBzIicAwsaSpM8ze6mtzVRh2e3SNnRiIlU4zDEFQEdBCiULGTLU2vSMFwWjxNLFUzrp4rveibcr0O mxe77xC4d30E4qyu4AUOJk/1nmF5hF96AMc+ESvFZhboYFdoZHKIrf/t3CwIpmlYzSuM5/sGfLrsGQ== Subject: [FFmpeg-devel] [PATCH 4/4] tools/target_dec_fuzzer: Adjust threshold for AASC 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: Oe5emqr7Shku Fixes: Timeout Fixes: 47919/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AASC_fuzzer-5176435830030336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index fefc8514f0..3450e60eea 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -208,6 +208,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { maxpixels = maxpixels_per_frame * maxiteration; maxsamples = maxsamples_per_frame * maxiteration; switch (c->p.id) { + case AV_CODEC_ID_AASC: maxpixels /= 1024; break; case AV_CODEC_ID_AGM: maxpixels /= 1024; break; case AV_CODEC_ID_ARBC: maxpixels /= 1024; break; case AV_CODEC_ID_BINKVIDEO: maxpixels /= 32; break;