From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 462934814A for ; Sun, 10 Mar 2024 15:25:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2704368CD59; Sun, 10 Mar 2024 17:25:29 +0200 (EET) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E8A368C566 for ; Sun, 10 Mar 2024 17:25:23 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-513a81b717cso218053e87.0 for ; Sun, 10 Mar 2024 08:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710084321; x=1710689121; darn=ffmpeg.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=hoQBL1YngDMv7WaE9rL5SePRw2qOBDk2ATw+qJIObW0=; b=Lo2plRvleUNpZ5HO2SehHoiDNNTXOeH35fQIoRX0TYANNv9ddROds26V7PsVdqxhZI SlJYNR5OyX+yQHBp4CFk9oFcqUwEgixEyHsE4T83Yd2F7BfHemlmMkS1HsjFg09Liifz 4z46eC/k1vpICi4b4cS6Dj3bXrPHAcTWN2zM6CusnRSrapxE2lbIfAcahIbG+BEEKGuc ic3CzPpcUnGMwxrAAYbfZOM2ybUhOZu/nSQiUHLntfyKthWAEDmmh4OEbmdWyl1ks35v Fz2xvOcAbtQbMtLhFSxSuRabNK0zjcCVvpUurk8kk8JugDcldAT4Bsvu25kv3NCVYeQf Br3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710084321; x=1710689121; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hoQBL1YngDMv7WaE9rL5SePRw2qOBDk2ATw+qJIObW0=; b=dtKcz8VvOSwA5xTdKqY6ARA8BlYexg+9soLUOVBzfEu+JYZiKYBfidcSWeXVTMN7+0 eEDgAhEz1CWDTxY72dlNbDITCVDWUdDxwboz9iDCg96a3QO0S6p4BjKAPuATpmGF0rVV oUDY7RgKUuKCbh7sHLgiiDg3+G+tSECEEOFNXajN8eNl3wDRdYV6Z+1hGy4hzNzm9i+L xiFuJp9KXMvbSBvuetC5sJghE/pghPlCohSjYWijHZIKMiqGzwv/9uKqUh7KqpJWDvpY lJ0W4tLp2F52gmARr6uaFOzGNquhH08KuGBcIXvPcm0JZPE1xXkAB14+ah+n6TnLQxse l/Qg== X-Gm-Message-State: AOJu0YyAFhLJyGAXcIto9iIuzLMeuba055LGPDn+XvBWwS/ce8wcNgET xz7B6XWyZMZRrUPOhI5aamV+cKi+u/YV7I0BjzMQNSTzBsd5e751RCf3UHqF X-Google-Smtp-Source: AGHT+IHr3A21yjjq6irDH8QU12p1tmdLCGiCnSotSn6/4S92gKZ2ez1CtcQzaf9GeqkGrg4fQNseVA== X-Received: by 2002:ac2:5b9b:0:b0:513:5977:4286 with SMTP id o27-20020ac25b9b000000b0051359774286mr2805598lfn.19.1710084321351; Sun, 10 Mar 2024 08:25:21 -0700 (PDT) Received: from mariano ([188.210.239.79]) by smtp.gmail.com with ESMTPSA id kk28-20020a170907767c00b00a4547925e3asm2023839ejc.141.2024.03.10.08.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Mar 2024 08:25:20 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id CAFD0BFCDC; Sun, 10 Mar 2024 16:25:18 +0100 (CET) Date: Sun, 10 Mar 2024 16:25:18 +0100 From: Stefano Sabatini To: FFmpeg development discussions and patches Message-ID: Mail-Followup-To: FFmpeg development discussions and patches , Andreas Rheinhardt References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.1.4 (2021-12-11) Subject: Re: [FFmpeg-devel] [PATCH 1/6] avcodec/tiff: Fix handling of av_strdup() failures X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On date Sunday 2024-03-10 15:12:16 +0100, Andreas Rheinhardt wrote: > For unknown geokey values, get_geokey_val() returns > "Unknown-%d" with val being used for %d. This string > is allocated and therefore all the known geokey values > (static strings) are strdup'ed. In case this fails > it is either ignored or treated as "Unknown-%d". > (Furthermore it is possible to call av_strdup(NULL), > although this is not documented to be legal.) > > This commit changes this by only returning the static strings > in get_geokey_val(); the unknown handling and strdup'ing > is moved out of it. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/tiff.c | 35 ++++++++++++++++------------------- > 1 file changed, 16 insertions(+), 19 deletions(-) > > diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c > index cb4d378753..4c7460cf41 100644 > --- a/libavcodec/tiff.c > +++ b/libavcodec/tiff.c > @@ -36,6 +36,7 @@ > #include > > #include "libavutil/attributes.h" > +#include "libavutil/avstring.h" > #include "libavutil/error.h" > #include "libavutil/intreadwrite.h" > #include "libavutil/opt.h" > @@ -179,19 +180,17 @@ static const char *search_keyval(const TiffGeoTagKeyName *keys, int n, int id) > return NULL; > } > > -static char *get_geokey_val(int key, int val) > +static const char *get_geokey_val(int key, uint16_t val) > { > - char *ap; > - > if (val == TIFF_GEO_KEY_UNDEFINED) > - return av_strdup("undefined"); > + return "undefined"; > if (val == TIFF_GEO_KEY_USER_DEFINED) > - return av_strdup("User-Defined"); > + return "User-Defined"; > > #define RET_GEOKEY_VAL(TYPE, array)\ > if (val >= TIFF_##TYPE##_OFFSET &&\ > val - TIFF_##TYPE##_OFFSET < FF_ARRAY_ELEMS(tiff_##array##_codes))\ > - return av_strdup(tiff_##array##_codes[val - TIFF_##TYPE##_OFFSET]); > + return tiff_##array##_codes[val - TIFF_##TYPE##_OFFSET]; > > switch (key) { > case TIFF_GT_MODEL_TYPE_GEOKEY: > @@ -224,13 +223,9 @@ static char *get_geokey_val(int key, int val) > RET_GEOKEY_VAL(PRIME_MERIDIAN, prime_meridian); > break; > case TIFF_PROJECTED_CS_TYPE_GEOKEY: > - ap = av_strdup(search_keyval(tiff_proj_cs_type_codes, FF_ARRAY_ELEMS(tiff_proj_cs_type_codes), val)); > - if(ap) return ap; > - break; > + return search_keyval(tiff_proj_cs_type_codes, FF_ARRAY_ELEMS(tiff_proj_cs_type_codes), val); > case TIFF_PROJECTION_GEOKEY: > - ap = av_strdup(search_keyval(tiff_projection_codes, FF_ARRAY_ELEMS(tiff_projection_codes), val)); > - if(ap) return ap; > - break; > + return search_keyval(tiff_projection_codes, FF_ARRAY_ELEMS(tiff_projection_codes), val); > case TIFF_PROJ_COORD_TRANS_GEOKEY: > RET_GEOKEY_VAL(COORD_TRANS, coord_trans); > break; > @@ -241,10 +236,7 @@ static char *get_geokey_val(int key, int val) > > } > > - ap = av_malloc(14); > - if (ap) > - snprintf(ap, 14, "Unknown-%d", val); > - return ap; > + return NULL; > } > > static char *doubles2str(double *dp, int count, const char *sep) > @@ -1634,9 +1626,14 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) > s->geotags[i].type = ff_tget_short(&s->gb, s->le); > s->geotags[i].count = ff_tget_short(&s->gb, s->le); > > - if (!s->geotags[i].type) > - s->geotags[i].val = get_geokey_val(s->geotags[i].key, ff_tget_short(&s->gb, s->le)); > - else > + if (!s->geotags[i].type) { > + uint16_t val = ff_tget_short(&s->gb, s->le); > + const char *str = get_geokey_val(s->geotags[i].key, val); > + > + s->geotags[i].val = str ? av_strdup(str) : av_asprintf("Unknown-%u", val); > + if (!s->geotags[i].val) > + return AVERROR(ENOMEM); > + } else > s->geotags[i].offset = ff_tget_short(&s->gb, s->le); nit++: you migth factorize the ff_tget_short call > } > break; LGTM. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".