From patchwork Wed May 22 01:04:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13230 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 AA579448A0F for ; Wed, 22 May 2019 04:14:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9702968A848; Wed, 22 May 2019 04:14:48 +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 4D4F668A67C for ; Wed, 22 May 2019 04:14:43 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id n25so403045wmk.4 for ; Tue, 21 May 2019 18:14:43 -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=bWnePs/scsGxvOtbkiMga6CUtlkfQE/j8fiM91iNzOY=; b=ljuiG5nbLk/vypuOxxKuNDNW9pIjZpeT8w02OANUtpu6de0k7k9uGMVCe5kbsb7h+2 6O9DZkNbicqY+Bdo+rBvKhFoiu5U/ifiJ0TnmfyjNycjZhfRqkfoHb3kdyCbrXLA58Cj tmQE8EABPMRZ9HTRjG/LHt+G+voF2Rxcbkh9Btl7vXe93OzNmfnfYETNHVHjb6R24ebb JvNSZOoKo0aabXTAGgKAt9JYfXlsXrEUGEpLUfECtv7WcYdacoQC45sURbzMX6UneQQN zUcbw9Pob/+Oln2uIPSnYW7YnFaiC+a9/6vtL4aAzFiSjozRQHCvNFlyEAtkXLJ2X6Jx nyLw== 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=bWnePs/scsGxvOtbkiMga6CUtlkfQE/j8fiM91iNzOY=; b=VHvgStQghclLvdhkCmGGZsLbXenIFwaD6D8nC6IISNRO3S1Pg4TU/qhKQJHokyDrX2 1bcSxaxhRgi1lOW/kRzflTyVdsMUpJ1zBH4iqhSfdTX2te8HYGkOH+sqaTkZd8M8M5OX uRiCtp4M8GxgzJgyo4Ue8wGlybPGN7lG4CozVuhwGLL/6dO5w/iTCBHWOz1n5lZWVL1m /q9MERQEdx+44JKm8DMaqc0SsNKGBVS6KMZbrWJAklUu/mMxY+leHsH3SCAybfpo+hTj qzRKTzulKB7uL19vDx+uVDKChJFsLday8YD7ykcHdhuhGZqf4MJF3LlwkoTItwp0anpF aFIw== X-Gm-Message-State: APjAAAV9lGgkwS0l35OZSUwz34AV7FDEZd62Z8qEeo+Q31qlVrS4ZGtZ cZlKKm3RNghF/SlV8Rrd94O5qRO6 X-Google-Smtp-Source: APXvYqzLANOpmmU7i9KNEV9XmQlrBnw9cE+dDLBZzhctvXUKRPOKLCxgNYXI4ACpIN2jusLA+VadQQ== X-Received: by 2002:a7b:c397:: with SMTP id s23mr5348426wmj.85.1558487682657; Tue, 21 May 2019 18:14:42 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id z1sm8614486wrl.91.2019.05.21.18.14.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 May 2019 18:14:42 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2019 03:04:38 +0200 Message-Id: <20190522010441.44257-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522010441.44257-1-andreas.rheinhardt@gmail.com> References: <20190522010441.44257-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/cbs_mpeg2: fix leak of extra_information_slice buffer in cbs_mpeg2_read_slice_header() 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: James Almer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: James Almer cbs_mpeg2_free_slice() calls av_buffer_unref() on extra_information_ref, meaning allocating with av_malloc() was not the intention. Signed-off-by: James Almer --- libavcodec/cbs_mpeg2_syntax_template.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index aa2544bc8a..d9ef480f39 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -381,10 +381,11 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw, current->extra_information_length = k; if (k > 0) { *rw = start; - current->extra_information = - av_malloc(current->extra_information_length); - if (!current->extra_information) + current->extra_information_ref = + av_buffer_alloc(current->extra_information_length); + if (!current->extra_information_ref) return AVERROR(ENOMEM); + current->extra_information = current->extra_information_ref->data; for (k = 0; k < current->extra_information_length; k++) { xui(1, extra_bit_slice, bit, 1, 1, 0); xui(8, extra_information_slice[k],