From patchwork Sun Jun 18 21:50:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42207 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp314217pzb; Sun, 18 Jun 2023 14:50:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7obRXnNMrruMnhuqDM8I2bR+i+JEEC6Y4DI5lq1FJkf0KYUQYWy7Ne46upsTfe0wdWvl5z X-Received: by 2002:a5d:4bc1:0:b0:30f:cd58:1012 with SMTP id l1-20020a5d4bc1000000b0030fcd581012mr6398625wrt.11.1687125037142; Sun, 18 Jun 2023 14:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687125037; cv=none; d=google.com; s=arc-20160816; b=IfwB1sHuAodn53FkfRBqyKw/2JNaaykqORaszGiVuds6PPGqHZNs7sJeAdk8wVAkmo DwM/FIcnHbIJ6gAVR+bvl75ZfovD2nxqgWXKjwrB6Knarha3D3M4GJCrzV8ZM7hF119T 1jrPQO4ffV+EpAXsccU4H7VxlOD1bms0KrsE71JqmXEIDNbJsnM5S4nwCBQtBLgGxefL 6ihcktcuuQBr/arM/IKnSHIoclydhrPscNEPqdADfhoT7sVMpupYKSIOpheHZb+NzlCr t6xjOYw0iid59tRRwaawc7WByZaRvoHvASWD6eddG9Fw9yiET5C3tzfhkj+KRJsKUSK/ cYfQ== 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=yRnVfNR9VhtQw3M+Kz+VD9VHQ2qCMNqL9yZXGBVC/Hc=; b=TxU/2f2zNUeZ48+ylzp4jQCigRbB5FQaaRjJ3hsfSmDJcq1bhtlDPyHN5S4jGMDpP8 aGzocPqqU+DTbpP3R+d8vydBQujeQCqi4iwKzlhdsrDM8aMC7o/8mAB+/i1juORDmqiL f8FUbYE+3x80dxLKSlB9NQPXnVP+j7ubeoXzAI9dBLwGtu1Ecfm5AJnyFQo73Hqw3xZv 0BAhz+1ozaf4UKMyubLVZqGADCa1gLu15zAyP0NtoJtIn4al+NrAQZW46jU+f9I89CA2 +u/sfZANfM/XDvupI7v2YdmxsW3WN6+lBiGKnHU6Nbt7Rv44831cwv0pDWNi5HU5S5dg b2tg== 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 c18-20020a17090603d200b0098879dbe312si1005530eja.431.2023.06.18.14.50.32; Sun, 18 Jun 2023 14:50:37 -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 6A36A68BF1D; Mon, 19 Jun 2023 00:50:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-02-2.mymagenta.at (mail-02-2.mymagenta.at [80.109.253.249]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 703E268A0F0 for ; Mon, 19 Jun 2023 00:50:23 +0300 (EEST) Received: from [192.168.232.136] (helo=ren-mail-psmtp-mg02.) by mail-02.mymagenta.at with esmtp (Exim 4.93) (envelope-from ) id 1qB0Hu-000k5K-N4 for ffmpeg-devel@ffmpeg.org; Sun, 18 Jun 2023 23:50:22 +0200 Received: from localhost ([84.115.40.24]) by ren-mail-psmtp-mg02. with ESMTP id B0HvqrzOlbZLDB0HvquNHy; Sun, 18 Jun 2023 23:50:23 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 84.115.40.24 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=648f7c1f a=4thelYDX6rwh+ygQwvsI+Q==:117 a=4thelYDX6rwh+ygQwvsI+Q==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=5IjLu0dzwJt126JF8wkA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Jun 2023 23:50:16 +0200 Message-Id: <20230618215021.3044-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4xfKa3S46c9EadXyFCc814lHZlFw6bKzEewvyq4M4ELU/DdBGq1SLUq6uJUgob5b1ZDdusZhuwzihbeiBn0ISCSHII+/onG3IKxMyIp93IU5fTeKhDZr3S Uy+ovjIuXAb+8s+sduqsBToW33QjoNXRffmNH2IyRgZyYlTRNbqt51jOC86DI1hgMOTJ66uVTdPh/w== Subject: [FFmpeg-devel] [PATCH 1/6] avformat/jpegxl_anim_dec: Perform operations in a different order 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: 4kOw37gibeRp Fixes: OOM Fixes: 59802/clusterfuzz-testcase-minimized-ffmpeg_dem_JPEGXL_ANIM_fuzzer-5681765466112000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/jpegxl_anim_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/jpegxl_anim_dec.c b/libavformat/jpegxl_anim_dec.c index 6ea6c46d8f..c62b596f76 100644 --- a/libavformat/jpegxl_anim_dec.c +++ b/libavformat/jpegxl_anim_dec.c @@ -227,7 +227,7 @@ static int jpegxl_anim_read_packet(AVFormatContext *s, AVPacket *pkt) if (ctx->initial && size < ctx->initial->size) size = ctx->initial->size; - if ((ret = av_new_packet(pkt, size) < 0)) + if ((ret = av_new_packet(pkt, size)) < 0) return ret; if (ctx->initial) {