From patchwork Mon Apr 29 12:32:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrdegier@gmail.com X-Patchwork-Id: 12939 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 6C4F1448CC2 for ; Mon, 29 Apr 2019 15:38:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49E9A689A81; Mon, 29 Apr 2019 15:38:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8C406899E4 for ; Mon, 29 Apr 2019 15:38:52 +0300 (EEST) Received: by mail-ed1-f67.google.com with SMTP id k45so8981832edb.6 for ; Mon, 29 Apr 2019 05:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=WqpWcrwZ5CaiP3iW50EI8Ce4McTNcwoGaF0pCENze6U=; b=ToTEuySAg07vbpfSMbNUyzflkOpYDt+SR9E+1+stEZ+55UqLiNwypTi/qLuLN5UxNE 1ioHmMezlPFnFkM4rBqd5lM2+CrTPeLG20fb1ZLMv3WQPEZC/7vAYvIWGrwR9y5emp/p C6RvuSqMVg43Tr2KS/hEZpmEDtgrbHLyQfnJyiwVg5Z14VGkEEGBPNSV52I7gKieFreq QX/Ijx9RjBdbdFbwAsLvcFvFu/SCS03cKFC8DwvKD+YD4MDI4VonD2lq5MqhdKlXyua6 HH5TsdkNhgaG2E3TBMqGhbFUdCoJ1wkkgsVdu882kYvL+eEa4h75CJ/atHJPd9XYvYIf l7qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=WqpWcrwZ5CaiP3iW50EI8Ce4McTNcwoGaF0pCENze6U=; b=QJ4ur404h4A+SvR5YCmhfPDm0CbhbQhszNeOrREMo7WIrT4HSXX6PEZbO6PR/oRd9G 4hGyOgKKR5165AZEM1Dxfyk8P8ozHAcdWr83N0e4Xwoaa3reCtRJPb0h3PTD7Ok7Ls3T YlRCKOG3U5+HCT6hiyVDwV2dPUbbjVJ5MWU8Uw3TM7BrljlVlnz2wVj/8cb4KBX4YYgV NFJ/sk+LpmnvDsSySi3xoooqmlKXtE6i5Qlc6RP3TccR1pDPhtqeMKh7RZbd52VSh/Aj CixmXP4t/Ee0wRv+gU89zkjTh2cgF34EzMGGZnV40InMytsJG48fwml4lfkN+IqGtnea m3qQ== X-Gm-Message-State: APjAAAU0bTkBNNHDMuqZwtHAJg23g1gClM6qpTqQr+ky1m5ggf+aiUXt yncBgKmOItZ+KLPyc9DLQB3KwKGyFlI= X-Google-Smtp-Source: APXvYqzSWfT+sh2c/EYUekd0B1EFHJilNkKzUJeQcsmGgadOqgRKr3cqwKo2Bi85PePhfDiQlENCqg== X-Received: by 2002:aa7:d7c7:: with SMTP id e7mr37437760eds.108.1556541115431; Mon, 29 Apr 2019 05:31:55 -0700 (PDT) Received: from yoyodyne.local.net ([80.82.202.196]) by smtp.gmail.com with ESMTPSA id s53sm846424edb.20.2019.04.29.05.31.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Apr 2019 05:31:54 -0700 (PDT) From: Menno de Gier To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2019 14:32:53 +0200 Message-Id: <20190429123253.23335-1-mrdegier@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/aacdec: account for small frame sizes. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some ADTS files have a first frame that's shorter than the 10 bytes that are being read while checking for ID3 tags. Fixes #7271 Signed-off-by: Menno de Gier --- libavformat/aacdec.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index bd324a1420..25bccfbcb8 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -184,6 +184,15 @@ static int adts_aac_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_INVALIDDATA; } + if (fsize < pkt->size) { + ret = avio_seek(s->pb, fsize - pkt->size, SEEK_CUR); + if (ret < 0) { + av_packet_unref(pkt); + return ret; + } + av_shrink_packet(pkt, fsize); + } + ret = av_append_packet(s->pb, pkt, fsize - pkt->size); if (ret < 0) av_packet_unref(pkt);