From patchwork Sun Jun 14 22:36:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20377 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 AAD8144A534 for ; Mon, 15 Jun 2020 01:41:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F34B68B71F; Mon, 15 Jun 2020 01:41:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EA0668B70F for ; Mon, 15 Jun 2020 01:41:54 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id q11so15191869wrp.3 for ; Sun, 14 Jun 2020 15:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R5+aGeixaz4KSpfS4tq5xZ4j+ZDT3yPI9gJsZSvq0no=; b=SqeJ/RuUCtT0kz6QmwP/e5+8AA/tZmDcrn2NMDvc7tBLEhubNdnoSjs1/e6fUvYybG +q7QeCOxBJZ4k3bNooo/NMY1jIf3QD9BqDMA+LDlwv6vAVereg6zVUev+xAfP/m4FGPe MG+Zo4OQY7CwDq3Y84HHJhTnyF/qNoJEet0PK2r3u9UAZu2wDQZ/+HqWtm/gEGlPSbre Hz7AvrI92RsPWI35u69er+H/Kbej0g7gIsYylRZB7RBZ3zXp0PPCHgJy1bYQaxJtz3tj YFO1y1U+NmyaA4OR9s3XI5SBTDu0lQQEr/SxNYhcZontg3hTDP2b8OwyOwqupqhjS5El jN5g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=R5+aGeixaz4KSpfS4tq5xZ4j+ZDT3yPI9gJsZSvq0no=; b=LgMOSTZ7SDqy+FSOgETmWZWgnPz3GWijguVOJFnh49taiSsadXA86z+eo6UFDGlb9X cJRvpYMwRUMetsYmaj63eZwT444nR97wjPDFdydOA4pYqPN0g6r/Q2ka9ZqviriUPm4B /lAGvUpAPFhs0LzgMLcEnLs0pOf1cTrTgosiwLZ2K+kqauvquRxbgouAihInAdf+UOy7 Tba2Rl9rADc9rnI6h0WQQbfhTrBiAZ5WzZuiRoN2YwG4gGwM1hnhwkExNYIKc1Ci//uT LPWWxOCUq4ncU2SbqOx4fy/V6N98ZbVkmyJxjynjs6i4mI7Q1J4oJydWkrfuIEPydtH+ wuGg== X-Gm-Message-State: AOAM533Kip8xDfurXVbD2b3GFyZQco//EwqxJLfeSXmKVuRJS004TlfF A7P85XTXJysTnxxd2F3BCCgJFlV7 X-Google-Smtp-Source: ABdhPJxwftNOaNdffmbrV/T8+j/UpwKrR2r1hLCmuDulIidbWt7714ZSfVKMozpqSS5mtnVCeZPtPQ== X-Received: by 2002:adf:f245:: with SMTP id b5mr25112542wrp.303.1592174513583; Sun, 14 Jun 2020 15:41:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id z8sm21491034wru.33.2020.06.14.15.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 15:41:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 00:36:56 +0200 Message-Id: <20200614223656.21338-26-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> References: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 26/26] avformat/mov: Fix reel_name size check 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Only read str_size bytes from offset 30 of extradata if the extradata is indeed at least 30 + str_size bytes long. Signed-off-by: Andreas Rheinhardt --- Honestly I don't know the spec describing the actual layout of the reel_name tag, but looking at this code as well as the one in movenc makes it clear that the check is wrong. libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a59c804d16..4e68532b69 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2342,7 +2342,7 @@ FF_ENABLE_DEPRECATION_WARNINGS uint32_t format = AV_RB32(st->codecpar->extradata + 22); if (format == AV_RB32("name") && (int64_t)size >= (int64_t)len + 18) { uint16_t str_size = AV_RB16(st->codecpar->extradata + 26); /* string length */ - if (str_size > 0 && size >= (int)str_size + 26) { + if (str_size > 0 && size >= (int)str_size + 30) { char *reel_name = av_malloc(str_size + 1); if (!reel_name) return AVERROR(ENOMEM);