From patchwork Tue Sep 15 07:39:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22386 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 070BC44B636 for ; Tue, 15 Sep 2020 10:40:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DECD268B94F; Tue, 15 Sep 2020 10:40:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 499D668B77C for ; Tue, 15 Sep 2020 10:40:12 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id a17so2160543wrn.6 for ; Tue, 15 Sep 2020 00:40:12 -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:mime-version :content-transfer-encoding; bh=BmWxCtbe48G3PcTbhhM8ufHKxcIdHBoq9OT6C/ihGTA=; b=RYJtcpiBCL3YhGmzPhBpthPCe1xrSnb/S9olJZ++nfH1PwCRTlYspy/R6/fN5d8QNv xz7EPKKvbRM78PkuXeREFt/M9l7RHj5i+vWgbcQKuyL84ddNm/Ye+fNSF8aS3dg20isf OiPBHRcTl4g7buCH5XK3c5IblP+4PxUWG22L1w4iGXcLcOAw9VHC3PJDC0vbfKhFqUN/ OK2iSH3c76REkRVB5C+WkW87Mxdd7lfvUQBncDjxQ8hsHdsBMghD/dNtdt2rvrl1TAFJ /g04U+7aawtvSYxrMQ+ugWBSOj5vL8gylS71LeSvVIlNaOEzimTz0ipGCBNnDWreclha 5rvQ== 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:mime-version :content-transfer-encoding; bh=BmWxCtbe48G3PcTbhhM8ufHKxcIdHBoq9OT6C/ihGTA=; b=eTiNmrd3xofc9zdggQ+c2NPv7gM7ZhoQAORDfoi8LIGcszhykn1wFObU1EusG1pRgm MdCSkg+a+CF3bJx4LeBl2JK8NZeYJt3gEQqvSaJj+n3zOAACrKuis+cNBIC2krYrluCG QCUgLDXX/eN+/kN2bUzjDlqBkvVUR6AUD1253Epboj937USgSYmgN/FLlmiiOdxU+nm9 EDm85/AKHzhKC1IUNJBQr2meTbQv9nSYYbRw8TREwi3ctwZQISkeJ94b4rCbIYjmadKW mX66otcbfV6YT/Mffhte01j4VwUyV3SL7QDu4qYjoA3Ad7tnIwz33x/gqfl7py8CADjN JJsw== X-Gm-Message-State: AOAM531dyYh3ChlmQPZ7yooiuRYkSMEnj46J0BFTSs7p/3eklpa84yqj PI5bMDbH8jWJ8QmCmu8UV7KMWskED9E= X-Google-Smtp-Source: ABdhPJxNzFASweZoRDQpwn4BDTcNDgOHNQDykmaZdZqwKt3wWY0jHQAKLg4VLEf6ha/dS24whadtDA== X-Received: by 2002:a5d:60c6:: with SMTP id x6mr19524813wrt.26.1600155611430; Tue, 15 Sep 2020 00:40:11 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:10 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:31 +0200 Message-Id: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/30] avcodec/flashsvenc: Avoid allocation of buffer, fix memleak 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" Up until now, the flashsv encoder tried to allocate two buffers in its init function; if only one of these allocations succeeds, the other buffer leaks. Fix this by making one of these buffers part of the context (its size is a compile-time constant). Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index f7f98efde3..4ac643c036 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -59,11 +59,11 @@ typedef struct FlashSVContext { uint8_t *previous_frame; int image_width, image_height; int block_width, block_height; - uint8_t *tmpblock; uint8_t *encbuffer; int block_size; z_stream zstream; int last_key_frame; + uint8_t tmpblock[3 * 256 * 256]; } FlashSVContext; static int copy_region_enc(uint8_t *sptr, uint8_t *dptr, int dx, int dy, @@ -96,7 +96,6 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx) av_freep(&s->encbuffer); av_freep(&s->previous_frame); - av_freep(&s->tmpblock); return 0; } @@ -121,10 +120,9 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx) s->image_width = avctx->width; s->image_height = avctx->height; - s->tmpblock = av_mallocz(3 * 256 * 256); s->encbuffer = av_mallocz(s->image_width * s->image_height * 3); - if (!s->tmpblock || !s->encbuffer) { + if (!s->encbuffer) { av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n"); return AVERROR(ENOMEM); }