From patchwork Tue Jan 7 13:55:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17236 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 B8DB144AC83 for ; Tue, 7 Jan 2020 15:56:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B6D268AD28; Tue, 7 Jan 2020 15:56:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08F7968AAFD for ; Tue, 7 Jan 2020 15:56:12 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id u2so19487323wmc.3 for ; Tue, 07 Jan 2020 05:56:12 -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 :mime-version:content-transfer-encoding; bh=V/ENE5B0RtkPEdGIQdG6p+G8/ZllUZ0z8SrpizNjYYg=; b=jqD3b7g21NytTYln1MOp3klj7tt7O4ga8ezYldyBbVzy/kv7+eB9R5TP6o+bLVdQ3A ar7R/eElfl1RN3uryYRZ3fimjwMkVDcMGrNf2xQArqB4IWdamKeUj3bZ2Wb4PCF4pmr8 sTzgrhKFhoE1GS20SYTyVi7WOHA9TJCdfIi3KaZ92jN6VBrAOCqtrfmTGyMHVH8gA5V8 wysS3PoBVgw1TL7Y/hj3s+azHqC8Ss9MKZQZMSF/emNgR24d8yPqidTA+zp9/6q8widc sIKS/Jnnuq616XObKrRDMkMywj5iT4jO7qmNIzlENXeC+t2DHNNDwqY7NhzPmjmoAOim 21TQ== 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=V/ENE5B0RtkPEdGIQdG6p+G8/ZllUZ0z8SrpizNjYYg=; b=qsgjHM+k1bivOqJXdBCwZS5V/m3WzIOgDSSW80TGNpoCzuJvXjjEgbKL2P3Z6x8zUe Rg5hU4XRS96MEEVs3dTB8Q7OqHjLNi3823/qyNn7LYnc7BCt8Sk+ambs3SazwNgen3eS CgrlCY8l00v+tTkMsOrLUbww+QTcNo7+erPKf+YSaHWtPYqHP/IP6RDB9IvQmCMzNlPF YV2Zz5Nn93UhYofquiu0szWQKGXpnJuQKl+0Qb/akSWndCU+GG4v+X7vHfPgHJMpo+PH hTfmNtq4FvjgU0s/4tV6ZQzHVtXWfWPZa9iWH5GtelUS96amLDNNHlb1FjxE1NcvQMQA T5mg== X-Gm-Message-State: APjAAAXBeuakGf1ZsFIrLNCqMzB6OSMzoxpQOuUaYeZtO1deS58kykEQ dsNYUIJmVoh0Qzs1f7Daf8C3xbEG X-Google-Smtp-Source: APXvYqzvLBdr383SbHuxkIxi2DEu/XNdV7P0jsSGdkz2Z1VveZ4y2Kelg7gwgSR5I0INZbXSQvuhbA== X-Received: by 2002:a05:600c:2150:: with SMTP id v16mr37438742wml.156.1578405371442; Tue, 07 Jan 2020 05:56:11 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id e18sm76167730wrr.95.2020.01.07.05.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 05:56:10 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jan 2020 14:55:42 +0100 Message-Id: <20200107135549.22581-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107135549.22581-1-andreas.rheinhardt@gmail.com> References: <20200107135549.22581-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/11] avformat/fitsdec: Fix potential leak of string in AVBPrint 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" by freeing it a bit earlier. Signed-off-by: Andreas Rheinhardt --- libavformat/fitsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/fitsdec.c b/libavformat/fitsdec.c index e917fc2375..e52ddc7e79 100644 --- a/libavformat/fitsdec.c +++ b/libavformat/fitsdec.c @@ -157,11 +157,11 @@ static int fits_read_packet(AVFormatContext *s, AVPacket *pkt) av_bprint_init(&avbuf, FITS_BLOCK_SIZE, AV_BPRINT_SIZE_UNLIMITED); while ((ret = is_image(s, fits, &header, &avbuf, &size)) == 0) { + av_bprint_finalize(&avbuf, NULL); pos = avio_skip(s->pb, size); if (pos < 0) return pos; - av_bprint_finalize(&avbuf, NULL); av_bprint_init(&avbuf, FITS_BLOCK_SIZE, AV_BPRINT_SIZE_UNLIMITED); avpriv_fits_header_init(&header, STATE_XTENSION); }