From patchwork Fri Oct 25 09:11:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15947 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 592174409F5 for ; Fri, 25 Oct 2019 12:12:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 270C968B3E6; Fri, 25 Oct 2019 12:12:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 431CA68AE41 for ; Fri, 25 Oct 2019 12:11:56 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id g7so1237831wmk.4 for ; Fri, 25 Oct 2019 02:11:56 -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=E+RpSXV5E4+7qc4s9lnQkUxc1JOuSkpilvnr7ZooEiU=; b=VjA58DF/XFVmYBNtVTA43pIjq5V13TshsuGT9a6TMivcD4regVvoYF/VPhSM3IQi0J D1sbniRLPV95BH7PlRV6yt4FLktzZBb5DSgZ4Wr3QmoTHEPGZqUp1XYYZu38xV8MBJMO EHuETWe74TyAd/7AyYtfiIKVDTcBdsI8yTq4l7ZMMQcPT/EoYax+2BGd5sUaSfcERS88 RXVJko8+JvLk95Qqv5SZeYNMlQzz1/iWaraZeJzXOWb7oVGzJHYe+lPhCqqDVrmWjjkU U490vibtTUbPrSGXlI3lv8TWzN31TpbLMnlxztdOcpSEjAPSASK5zeGaSfZdmJy5CLV1 uv7A== 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=E+RpSXV5E4+7qc4s9lnQkUxc1JOuSkpilvnr7ZooEiU=; b=QP5pYoj16Qo8Yr+NJ7L/VqWdZ3s8h7x1OkPOMeb7TdWGJaveGaMN+qR1quFm5L5EuL P2R+MqwjPVyGvXSyIYfgH0yTIZEmbbbhp8k7p+eRqybClHRIYSHbLIKCz8Qv2eDcHsXw s2Tpz1B4+iiT91XnVFJdOD5xj13DZrVfD+Pb4QLC6k1Qz5Sm5nmSIlcWm0qjD6MD2A+v 8oOffaeP5CXtNelgGrXVkq8ayI8S4qxR5hZzamSLrc/EOmICUwQwTTAtMc1Cg92qZZ38 qshSV1ApZY6HvAXhGRMyaFijhNPu8gm1N2B4G0+59RYVcnGlthTsgvoyI2dL4Nrk83KG 482Q== X-Gm-Message-State: APjAAAVUXx6teNSbzExpJXQlS5bB/Z1oPLaHJIjH4UXy5VNi+HCWcU/l c0GwRu7eEGBkCLHEz2AHcuHv1X/f X-Google-Smtp-Source: APXvYqyaCI8ekxsl1AatVr928CDO8LhCSFpwYGrQtP5XEQoTKSqpeQ2L7li0/s6SzRdZAlJvVSrpKw== X-Received: by 2002:a7b:c92f:: with SMTP id h15mr2553980wml.145.1571994715555; Fri, 25 Oct 2019 02:11:55 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id d202sm1516724wmd.47.2019.10.25.02.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 02:11:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Oct 2019 11:11:45 +0200 Message-Id: <20191025091147.5298-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191025085222.4498-1-andreas.rheinhardt@gmail.com> References: <20191025085222.4498-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] 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 --- This patchset was actually meant as a reply to [1], but I made an error with the in-reply-to headers. [1]: http://ffmpeg.org/pipermail/ffmpeg-devel/2019-October/252057.html libavformat/flvenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e327545dcf..0e6c66a5ff 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -990,7 +990,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);