From patchwork Thu Dec 26 10:53:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16976 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 6E82B44A9C8 for ; Thu, 26 Dec 2019 13:01:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4ADCA68AC23; Thu, 26 Dec 2019 13:01:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23F2268A248 for ; Thu, 26 Dec 2019 13:01:12 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id z7so23310691wrl.13 for ; Thu, 26 Dec 2019 03:01:12 -0800 (PST) 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=WOdeS4622L47llrhEqrt/7Rn1/sUNVpywVM21kqm46o=; b=u0KN/Ie0DDCxlYRpfn5Q2A6WLJv24MTAbTMx116NsoVOKMvpnYCiAz0EDLinGZNX9Z TVG29pIQHlqsbj9eSO8MHBj6PRdpK/fPOJ9CLTpwYQDjHAUHEk6hFq3KA8UKeu27bhQ0 Ci6/6380dPssNeHZBh7Vm8F5fQGmqV9Fc5iSFWCaUWNvLLXhR5eQJrFJEp1b9udf69Kr gQruuaBO6T7yrW9NNDfwk5t6WKh1mQoVIH0C0UTmkAigN1ZKlkRNU/nK1hC4Lx7P/w6P 7OnkxI6zVhpyq6surTU+LkDknf3UmRvbfeMHCNbexVKOc6s7g/Dd/FTpz1HRVa5t+ryH FiAg== 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=WOdeS4622L47llrhEqrt/7Rn1/sUNVpywVM21kqm46o=; b=mQsoi7oYJ5RSlDVYG2G7lOAkaUVIWd4A0V5k6KmwPH0zwQClFYGW/Co6rUTomDSpYT dviT9t92YUJO7f6lkJ1PxUAIWTZ0YySjtnjRJnmka81eWVwCt8qdprovAKrNep7ARdTk QeeMsX9UhDJZ7ofFNNZB9Yt7b/9rg1Be43nyFKrYIRvewM2TQoWqcXN+piDJdQqnGqj+ 6yBcUYAE1wyIggjYFnEv32RecjthMX3skxaeFgRt7k9QKOd4WBLalpnanIj/wmB3/T9M Lwj+OpkfPhhMqJtEuC96uPh5j5eBrY5pQHs1wmJNDUK4MvgFexmdNg2I7OGs0eJe+UZH bgZg== X-Gm-Message-State: APjAAAVXOef3ivIddT/XLeo5fD8CYzozc65iUjMhRHR7d4ORT+o+8RP5 XLlJ6RvKET3rKa0sgtcNoAJxLUsN X-Google-Smtp-Source: APXvYqwGqmO7c4SkHGYTnEQfIpyLQtEO+SqOQA3B/2KmNUatLe2Y/ElYArDkG49r35ArPNpAjzugJg== X-Received: by 2002:adf:a141:: with SMTP id r1mr45304191wrr.285.1577357654654; Thu, 26 Dec 2019 02:54:14 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:54:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:35 +0100 Message-Id: <20191226105342.11175-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> References: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/17] avformat/flvenc: Fix leak of oversized packets 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" Might happen for annex B H.264. Signed-off-by: Andreas Rheinhardt --- No change since last time. libavformat/flvenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index f6379cbe05..1aaf0333ca 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -992,7 +992,8 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) if (size + flags_size >= 1<<24) { av_log(s, AV_LOG_ERROR, "Too large packet with size %u >= %u\n", size + flags_size, 1<<24); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto fail; } avio_wb24(pb, size + flags_size);