From patchwork Wed Dec 2 04:22:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24286 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 04A6B44AD65 for ; Wed, 2 Dec 2020 06:30:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7789868A326; Wed, 2 Dec 2020 06:24:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AEAD68A214 for ; Wed, 2 Dec 2020 06:24:05 +0200 (EET) Received: by mail-ej1-f65.google.com with SMTP id m19so609172ejj.11 for ; Tue, 01 Dec 2020 20:24:05 -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:reply-to :mime-version:content-transfer-encoding; bh=3o/+jgyxqONiVfsh9XA9uwEepwx/8yHumeTfslvsd6c=; b=T9R3VxDoWWMp2wqNRGcA39Zu/2SCPzKRsHnIjrJj4l9uE+gl8KlpbnZcRJlllkqvxq sxgk7r0VDn7iCM1Roh9HLOaytQuiD21JJZfhzbNCmuyOQTei9iEfQzSS6sCdl4f9GdcD VhDwED0qG8tTr6HsXK16PvO7AZ6XK5Rk+XslXGMO2YlctCneHivWGiYXA0TJAfMWJYUk 8genXABP4GySa1wShXqpaDNtmaitRYhF8Ug7jB++LAZKhWA6qrdJixGxxRY3oBLhg51e 9MGrnB6m0H3BKnbzx13KKbwUpL4p6sBqJ0mSIz5vonPu8tyQEFSo3au9QSBWafu/7pBq 1oVQ== 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:reply-to:mime-version:content-transfer-encoding; bh=3o/+jgyxqONiVfsh9XA9uwEepwx/8yHumeTfslvsd6c=; b=SAerC3opvoKY5lus87dtHmF6iB6oa8ycRgWa2D62iekxNFhKmF5L6SmfhXslLxGCFl ekb1PDYAg7dzeMKoKJnUcttc7lILgmFDDASgIbPQNqCoZFWA6X3nn57/E56qKTeXlVP1 Y7u5GMDOGczmnX/S272NfPCtUyunew6PVhJDofOTFOYsIG4WW1MTdJY89wKp3yjM1TI6 L2+Ruvl1iGuLRmrguHuW93sn8WoNr57psfLI/3dhLL+0d5X98LzLZqEAon0qiRfzVVXD MOqSAqKk0zoTPb19xBerjpBvYR4Qx0AC5JAE+xMqOjKuf972mSI8PA3bgMrGBQvls0XG CN8g== X-Gm-Message-State: AOAM530b//GxTPRwJ9UWwwT8qRMhHMOB5bYM9R598KpcXVC3eSGSNjCS jeOHVkdKvNZyxrqf5dtwHRUHfk0r6i5fQQ== X-Google-Smtp-Source: ABdhPJwS82tZ7pPnIesQYz/PxRP4rjtqjcCvCAF4qtnbxGAjEBuYmUoXwDy5Nh/CCzEy+DY/tM/2Mg== X-Received: by 2002:a17:906:fa13:: with SMTP id lo19mr532424ejb.455.1606883044328; Tue, 01 Dec 2020 20:24:04 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id mc25sm265087ejb.58.2020.12.01.20.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 20:24:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Dec 2020 05:22:06 +0100 Message-Id: <20201202042244.519127-45-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 179/217] avcodec/vqavideo: Cleanup generically on init failure 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/vqavideo.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 05f77fd1c8..004e11ed7f 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -171,17 +171,17 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx) s->codebook_size = MAX_CODEBOOK_SIZE; s->codebook = av_malloc(s->codebook_size); if (!s->codebook) - goto fail; + return AVERROR(ENOMEM); s->next_codebook_buffer = av_malloc(s->codebook_size); if (!s->next_codebook_buffer) - goto fail; + return AVERROR(ENOMEM); /* allocate decode buffer */ s->decode_buffer_size = (s->width / s->vector_width) * (s->height / s->vector_height) * 2; s->decode_buffer = av_mallocz(s->decode_buffer_size); if (!s->decode_buffer) - goto fail; + return AVERROR(ENOMEM); /* initialize the solid-color vectors */ if (s->vector_height == 4) { @@ -198,11 +198,6 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx) s->next_codebook_buffer_index = 0; return 0; -fail: - av_freep(&s->codebook); - av_freep(&s->next_codebook_buffer); - av_freep(&s->decode_buffer); - return AVERROR(ENOMEM); } #define CHECK_COUNT() \ @@ -653,5 +648,5 @@ AVCodec ff_vqa_decoder = { .decode = vqa_decode_frame, .capabilities = AV_CODEC_CAP_DR1, .defaults = vqa_defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };