From patchwork Tue Oct 24 22:33:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fredrik Hubinette X-Patchwork-Id: 5681 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1142839jah; Tue, 24 Oct 2017 15:33:33 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TSpEFEKzcVzcG3lGpTyaY22ywv1VeEDFoKd8QCEw9triIwPs26A3dpxFDStTEokgMLhRha X-Received: by 10.28.54.22 with SMTP id d22mr42935wma.120.1508884413809; Tue, 24 Oct 2017 15:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508884413; cv=none; d=google.com; s=arc-20160816; b=p5G/YV4f+cEn4ZIn/0c92iZk7LlHlUp08dLbuoixr6bf3R40e/pBPn+vSmaSqMUSI4 8QUd4sXJKpUoarWYz9ZXQapgMF05vVBxjgfpa/sD3oVSw+qTt2CTVamjiKMuR/RtrR8L olInUO/g/IiaF5DZIpoAQVYxithWk5Bmk6ISyr5uAcTW+urboTJUil9Zwqm8NfJq/WjS Oxjqum4SY3nIK9MXNXKrK/LOHHDcUyiDSBelh046l6vn5kDBQZDZIdrBsBflQNCj6oVT uX8CDe0p5w5o8KLlsCicZ/isSoE4LU3VeBUtwSXRAmsOzip7UYvRkSfLizksgCMUMMeV IczA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=t0EvcfWGo50mPyvA9XZ0ST0JIFZbxmr+u43i1cT6c8c=; b=wMYRSVkeWofGP+CeUGDIzE0GOrL7u/8vo6cCu0O3vMemOPdEHagdtSA7rkE6y5C8Hc l2uHeW4tnnzexNpsyqaXUfql70/dSoT/Bf2xdwRyjFV8j926bY8oEJOwodwlI/oVHtI4 bfKT6dqWIXPRTNMibho/oUhRX4lDxt+g4iZ6eobJdpTFUm+U95ol23Lo9HdTmQkhptgr sgIXuVYQpEwF91B0BFKka32PfwKDl/j1CzpkXJLhu6gNqylaKVVcx5AhzQMMGB8YbA4b ZXFxeVGbc8F0C0/TexdFcFfdwxUywUx1h/oHxQGdqT02fuSygsUYucH76ntydG/J8dnW RAvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=HKHDMrpi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b11si920781wrf.124.2017.10.24.15.33.33; Tue, 24 Oct 2017 15:33:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=HKHDMrpi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B72DA68A34F; Wed, 25 Oct 2017 01:33:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8896F68A18E for ; Wed, 25 Oct 2017 01:33:18 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id z3so12148492wme.5 for ; Tue, 24 Oct 2017 15:33:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=OY7ITGkA0yv2OZHptRxElEPx7gzzXt6aq34ShrPw5PQ=; b=HKHDMrpiKZplL6h88YN7/dAF2rDLlRSC8lDgg9LG/CMZlHbi73iDn7X8CkF3DuIA8O Zd3AFv6MfiYOFgnq3saqqPCuriU1ehZucBPzIjlKnpHCsah4qFCUwqEVfFubCI43T672 UqfMDhD7z2DR6/SNjtK5kSPlC9KXu/UVosHKqHfgBF+miS8/G5NFoHTXVf+1fOSdnAbB fH2SqtxuBjBMhnorUr5or5JD/c0XOILBu2L/1VB8aF28vk4j0IwAHHauO2to0jbS3DC7 SD0MRkp7GFqd4zmG9bp0g4RfFRJVJUHOXnM79Ulu6loOkl5X0pAkuyESjd+j1lywsO+B i9qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=OY7ITGkA0yv2OZHptRxElEPx7gzzXt6aq34ShrPw5PQ=; b=L4NBT/j5IcHEQQEkVHGZ/wSb/DLHsWiSUlPZqYBopgsJit75FgnwDoB8WvWNbKajny ceHYjwZMu/9qqRLEL2Ga7m+92Ad3KmRu2XL8oNon0ZZ/TT+p8XijYuPhAoK9gb8qilHx lOFKqB0ARG5EWfE3pdZYYi1LbOg1DYC7jKT9UYUPGhnU1fwEvcYQFPlEuFKimZ5kVKzc 3YRn8rpwoC5U02wIsGaKxWFZoH/GvKLnzwyvS4d35RFoafhZvP80r0TN0/43XUJYsq2w aljViWIjiS8Z+71VWqoTy535Lkl69FA8WG4eaVK3Be+Li2wihHFx902B33q4AMPL0o+p mCmA== X-Gm-Message-State: AMCzsaX61o5mbLggfb/E67miX1Yb7liR0ml/5uuOEDsGRnF7SdEir9Pu 7T01WMICQPBLJikZARzJGd0zsj4xoI7G+2NU+FqfGtzlgWI= X-Received: by 10.28.47.69 with SMTP id v66mr52875wmv.98.1508884405127; Tue, 24 Oct 2017 15:33:25 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.237.4 with HTTP; Tue, 24 Oct 2017 15:33:24 -0700 (PDT) From: Fredrik Hubinette Date: Tue, 24 Oct 2017 15:33:24 -0700 Message-ID: To: ffmpeg-devel X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] fix minor leak in id3v2 parsing 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" From a6a79bda55868f7faee0f183a45191d3251fb5f1 Mon Sep 17 00:00:00 2001 From: Fredrik Hubinette Date: Tue, 7 Feb 2017 12:19:38 -0800 Subject: [PATCH] Fix minor ffmpeg memory leak in id3v2 parsing. Reviewed-on: https://chromium-review.googlesource.com/439405 Reviewed-by: Dale Curtis --- libavformat/id3v2.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) end = avio_rb32(pb); diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9969d7a6ca..b3036d2f87 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -688,9 +688,9 @@ static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, const cha } if (decode_str(s, pb, 0, &dst, &len) < 0) - return; + goto end; if (len < 16) - return; + goto end; start = avio_rb32(pb);