From patchwork Tue Oct 13 03:22:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22898 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D4076447D66 for ; Tue, 13 Oct 2020 06:22:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A7A068BB8C; Tue, 13 Oct 2020 06:22:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA72468BA06 for ; Tue, 13 Oct 2020 06:22:35 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id e10so15789143pfj.1 for ; Mon, 12 Oct 2020 20:22:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miceli-net-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WxpGEVR+6y3krcMeU+8Db6M4iFpcgSL3+coGVwcQbnY=; b=1ndhupOiQjn1qSkU6h7iGu4bXdhwsVETzFCiTL10GMgxt28SpJU2CEMOBsa4ft6PGW mJn0bh8pFpjSQgYsDGptT+oejolM5sPpIWR78lBk99lEVSeyMiK3Ky8QVSej75FgDUip QyLDB8J/SY6WtdM7ebYGrq9Ynt1dJG4nbGl5Z7LoWtpIg8UDQJd2n3ilhyVeUjlfEZVf N3oRM9I49DkZWkIVDsSuCV5yyWaZiBqUyiS0S4A0S4XyDwNWZhRdFQQYejHaiaMOISn1 fJbLB0UGQu9eNP/+BFD1pJ0U/6wcv8qYpOCsULJkC5s4YHKTUWCU94CW9OyyPBFWPBQ8 ybjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WxpGEVR+6y3krcMeU+8Db6M4iFpcgSL3+coGVwcQbnY=; b=HVnHKcT2dqBkZDJmXWILRpNDOkY1xwXROb8u9EnxDw8GGr+aMIDcSJeoRYQPBBxd74 mcICOIIG6Wt43bJagWOAEeAUaVO/ukqvjP52w/v0oLQ34c1XPKT9DSpCBKfZKvVYhSCm ZsgiBNGEopyixGRyp7AJ/uGX3LoYsXKegzf9G4GIHJQyTVIY1aZ3bwJm/U+jCkSyVWmr IyQcVwJhWLIEDG3897k0DiGJRi6GsewcPRxPRhWAsOyBfuaCgL0r51ugD7U4egjUtnzf 6hCufoqUkOTPjHpdYIpaIOtjYBZ3a/e+G1zDzjvinymLwN9ynJW6vCk1qm4a02UTFQZa WYwA== X-Gm-Message-State: AOAM531OdCki4KkXwhkowZq3JTgDxRhpop1AGf49Sr7+orIzLhxk095J QBcqkkHtK1JXRFTz6s9WyxGZPFSRLRoOn0c9 X-Google-Smtp-Source: ABdhPJzppWjDoSqehnxgnn5spOVeksAIJK5JVaYVXMUFvEGMlYWo3MLDnw6+fmgApdLLlbsGSuyVfw== X-Received: by 2002:a17:90a:1861:: with SMTP id r88mr22929437pja.222.1602559352867; Mon, 12 Oct 2020 20:22:32 -0700 (PDT) Received: from edna.localdomain (119-18-3-107.771203.syd.nbn.aussiebb.net. [119.18.3.107]) by smtp.gmail.com with ESMTPSA id 188sm2875763pga.35.2020.10.12.20.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 20:22:32 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 14:22:25 +1100 Message-Id: <20201013032225.97512-1-chris@miceli.net.au> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/avidec: check memory allocation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Chris Miceli Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Memory allocation for AVIOContext should be checked. In this code, all error conditions are sent to the "goto error". --- libavformat/avidec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 9765e5e7b2..33e50e9878 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1072,11 +1072,15 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt) ff_const59 AVInputFormat *sub_demuxer; AVRational time_base; int size; + AVProbeData pd; + unsigned int desc_len; AVIOContext *pb = avio_alloc_context(pkt->data + 7, pkt->size - 7, 0, NULL, NULL, NULL, NULL); - AVProbeData pd; - unsigned int desc_len = avio_rl32(pb); + if (!pb) + goto error; + + desc_len = avio_rl32(pb); if (desc_len > pb->buf_end - pb->buf_ptr) goto error;