From patchwork Fri Apr 23 17:50:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1749786iob; Fri, 23 Apr 2021 10:52:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRc/e4m9n25tJrqejj/jk3kFEeplXAmu0U0BsqbvbpzNvZ96y4kfOcYaELiuxO7P33kQFt X-Received: by 2002:a05:6402:27d3:: with SMTP id c19mr5965415ede.129.1619200343181; Fri, 23 Apr 2021 10:52:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200343; cv=none; d=google.com; s=arc-20160816; b=IEwh2gFR30QOdVJ0qSx1PRmQQ/wFCx8MyV65yG9EljpLUTQNbOhmsAInmbdhhZmKO7 uz+VSBganLIm4IU3zgTBszRO1Mc0cS9iDGRsBHZCO2io+1CB6Iz0gyfGzFuif/hRu9O0 Eb06aKQpFODeKvpo3LuBRb3i9Kk1BBdUbPCj3vvshMw9LKmbifwO3gpchac0yBRrIwDt KkwHUARsNEMLnN6/u2BLf+T5t2O8nNnGZxUiYKvvTILKj5MSmWA4ypS2k7HHW1fHvlMN qR38t0vxN0aGqPLOz5ZgqwNAHZUbxgPp04FwDBS8bvOoakavT5FtY/q4E/CzxBG8gOF4 NUHw== 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=GHD5cQXYZQrnFjC7p5umXycfbDTVIYrYtI14+zbC5/A=; b=CFVfJLMsUCPOR47a2gqGG5G7TOlH3+Hk2pvC+EeykKw7MJ03FZu+C9yypJUgCjBXUO 0dfaZpxcsDg1dUoD4crVNL0p4Bmiu2cccZdIDf+PTUkeR40xk0iIhS6QIHWX6SEMSbze D3J0AivfA9ANLBvey1S1RWBeHRckNLhfR4UvsteBwkYB0/M2yUd0+TRkVWgAyE1iiJt2 ZLUSpXrfRu4zyfYxvvV1ufg82BEkVbTZAcn1Sem4VNaJkkQPnV7B594I9SR8qmBeu1w+ h9AcWrc0o51bXXCFd8q/28ZB+gJlALW7QQqyvlvZNiQE+amh25kjLxPcxZB+iJqEc+LC fSPQ== 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 p26si5729221ejz.239.2021.04.23.10.52.22; Fri, 23 Apr 2021 10:52:23 -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 4336B680107; Fri, 23 Apr 2021 20:52:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C190F68987B for ; Fri, 23 Apr 2021 20:51:57 +0300 (EEST) 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 1lZzy9-00336w-0I for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxAlGeY1ljeHZzxAlb2ne; Fri, 23 Apr 2021 19:50:57 +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.3 cv=BoHjPrf5 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=nZOtpAppAAAA:20 a=W-GeKqF9Rv45Jb_JCTsA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:50 +0200 Message-Id: <20210423175056.24019-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKPM2k8SHcfE0jCKoBXOCwCY6kBDQ7MZRVMFl7KnG8xwlNW6ve546x6zkU8nbidRcnd4w+Vx7ZQjGv68H+PxwsDfyTdnhcwgQmCYGQ4Avp07A5u0M6p8 GZLuyKjGqdngI8hkCMU3T1kGzhK7BI0bQi8qL/ZXGIVr6jJgbexNH5Iw Subject: [FFmpeg-devel] [PATCH 1/7] avformat/asfdec_o: shrink extradata to the initialized size 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: ewTXi3MDqp9X Fixes: OOM Fixes: 27240/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-5937469859823616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_o.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 6cfcd8b088..d08a09c14d 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -600,8 +600,12 @@ static int parse_video_info(AVIOContext *pb, AVStream *st) memset(st->codecpar->extradata + st->codecpar->extradata_size , 0, AV_INPUT_BUFFER_PADDING_SIZE); if ((ret = avio_read(pb, st->codecpar->extradata, - st->codecpar->extradata_size)) < 0) + st->codecpar->extradata_size)) < 0) { + st->codecpar->extradata_size = 0; + av_freep(&st->codecpar->extradata); return ret; + } + st->codecpar->extradata_size = ret; } return 0; }