From patchwork Sat Jan 23 20:47:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25133 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 3085844B48E for ; Sat, 23 Jan 2021 22:48:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14DB9689DCF; Sat, 23 Jan 2021 22:48:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F04E0688298 for ; Sat, 23 Jan 2021 22:48:30 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id l12so8451078wry.2 for ; Sat, 23 Jan 2021 12:48:30 -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=5RSuHffZC2E4qPeDPsfxEpEtrAhpn+IKEmxfE77qg7U=; b=ij6sDB6s6jwUzXAxj8IQ4k7NuSTiN7+YRMMgHrsVxkgdNfitnOD/lzNwLJn5ECC+0I yv1/hW2Ate0z6ES6og35iH/xa/naYb+miw533dh3RQP/xELfLolfw0gzkXsz4eeLrAyy HuHlnIv5epx0DNWdS2IoE2WsLpKiylmbiMqcszRS4Fe01DbGDoYjpNWScrrseRGDVCRk 2XrJbsX61KREm+CrsZ0PPILPkgjJdRk+0/oBTQJycbn8ubfwSI8+93tN9XMoG0F01O+9 n5iRHy9EqQ3wa6k5IenbKBfRDVT0N3iN2mVP75YbwGWsos7p8DqX5ePkAr+cDyfSObzd 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:reply-to:mime-version:content-transfer-encoding; bh=5RSuHffZC2E4qPeDPsfxEpEtrAhpn+IKEmxfE77qg7U=; b=DWcKYdSoRLShb/2HkAftQZqGxyOTK7VZGjfWnzRf7N81Z1+ehqCeDgJ+NMmNr17ln8 fLvXwzRJIbwJMBB61jWDNkv0MpZ3TFSLPq+9giEd2mkXIL9HS1jkhFQlfzqdq4PG+a0k MLmYU51DWF9pHuNh/bEdk9GG+b50JtTrjfVUgM2h+2kNJrDRABPSA1fonPyBKzboW4Yq lT7ngSq32fIW4kYZvee35HZT7WAK/z2s43MIhcZzF96hYvlERuLrdVuQbLJfSzA+uVtu dlMRriuQAvs+CvXr496zobYoCX+h9T82sQ9mx2hocqEc+ogqIop0FTIs89FVe8ofYkX4 htyQ== X-Gm-Message-State: AOAM530uiGrdNLgvucwBRnL3JSQaMC5rrSFAHgiCEYYw3FgKPOFws1Yi Z94yHQe2XQY/wG15PcX5StcbPzIyvQI= X-Google-Smtp-Source: ABdhPJx8q4b+Z5g6kOla40BGJTCUC4mhhp78nTe1MphXCmcpo1nD7opnUtpfLJq4hFqTOaDbAcbPkw== X-Received: by 2002:adf:8145:: with SMTP id 63mr231771wrm.8.1611434910308; Sat, 23 Jan 2021 12:48:30 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:56 +0100 Message-Id: <20210123204800.689497-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/10] avcodec/exif: Avoid allocation for small buffer 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/exif.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/exif.c b/libavcodec/exif.c index 2874772db4..0b656fd09b 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -95,22 +95,15 @@ static int exif_decode_tag(void *logctx, GetByteContext *gbytes, int le, ret = ff_exif_decode_ifd(logctx, gbytes, le, depth + 1, metadata); } else { const char *name = exif_get_tag_name(id); - char *use_name = (char*) name; - - if (!use_name) { - use_name = av_malloc(7); - if (!use_name) { - return AVERROR(ENOMEM); - } - snprintf(use_name, 7, "0x%04X", id); - } - - ret = exif_add_metadata(logctx, count, type, use_name, NULL, - gbytes, le, metadata); + char buf[7]; if (!name) { - av_freep(&use_name); + name = buf; + snprintf(buf, sizeof(buf), "0x%04X", id); } + + ret = exif_add_metadata(logctx, count, type, name, NULL, + gbytes, le, metadata); } bytestream2_seek(gbytes, cur_pos, SEEK_SET);