From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by master.gitmailbox.com (Postfix) with ESMTPS id C8BD340726 for ; Wed, 22 Dec 2021 15:27:35 +0000 (UTC) Received: by mail-oi1-f174.google.com with SMTP id w64so4437499oif.10 for ; Wed, 22 Dec 2021 07:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=BKnvysC4+77ghBfg4JJQEc87JTh1i8ZYjV9d/pAd33w=; b=Htz70wpzfrcZyNLM4F0DNM0l3tzaFrRDOvKnonIqgrEw5XFIDOpXdiE7bx1OfnmXH/ T6f2ObY6xwsQWdO7GB/cZILuLC4XoS2MbEjDqgnBMobYUhA2AnujMqydSonwHYPbCzLJ uCtfHm1WomGq+XOVxkNHyteiLNFTGuMKoFraKT8Kpf4Lxj2ZCU/ic5d5y5quFyoF5a9V q7tR+QoiawBfrdTu6ZVeQXjSY3H3KB1duvg2GBwtqYooCJ40rb/Qkia3gS/vzRRy6Y/p bm5bV6fER6zsbp3LuqmI3KptGsU7HHDTwQ3n1b/bt1BHMQauYYczJlBEHHxkIwX9AboE qGPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=BKnvysC4+77ghBfg4JJQEc87JTh1i8ZYjV9d/pAd33w=; b=SVFTbBiPlOdPfA1LLx/2kCrGjgisVnIySKpBydvH8+GxHYehea1wHipSenimPV0012 aUcigvRkwTzRPFi3MIqtfrc6R0H+X8RQSf/vOgFzRjDgzNLgv22N2U8UHd+aoeGrWC4+ yXj9vW8+ulOCIcn+gONxidT/H+rJo+uMzNg2CuL2Bw2OdI6UIY0v7jFYhDI48I5I4i5n IAGhLAOUsbt71pDl9HEfN5hZE+Tte0FJv6rMxvdZpVflQISySFVIHwdSIWA6rEjBr/X7 ZHLwtTtSePhSg/L66NoxpgpNBRHoV9fNxSXur4Kl5/Z8BazFhCgw6vC2assoPU3ZT5Px Dpew== X-Gm-Message-State: AOAM530ykUL7hbN+w2HFA79CAjPfKRkxrOYWLgAS1ZjuDmU9oshTlUj+ fnylu8RR4oWeqaCaJ0qk+pmmnblWR98NSiFt X-Google-Smtp-Source: ABdhPJxcbBXGittpSuF/kkaVY1mcePKUqBNEiWcxYv8txxYP3bdVBA3zQhXAwgJHPQPdOW+ygfYWZA== X-Received: by 2002:a17:90b:3889:: with SMTP id mu9mr1673729pjb.160.1640183592386; Wed, 22 Dec 2021 06:33:12 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id e15sm2312466pga.53.2021.12.22.06.33.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Dec 2021 06:33:12 -0800 (PST) Message-Id: <8fa3a58039f6ee66a2fa3a69cbd688d10824990c.1640183587.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Wed, 22 Dec 2021 14:33:00 +0000 Subject: [PATCH 04/11] libavformat/asfdec: fixing get_tag Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: ffmpegdev@gitmailbox.com Cc: softworkz , softworkz Archived-At: List-Archive: List-Post: From: softworkz These three are closely related and can't be separated easily: In get_tag, the code was adding 22 bytes (in order to allow it to hold 64bit numbers as string) to the value len for creating creating a buffer. This was unnecessarily imposing a size-constraint on the value_len parameter. The code in get_tag, was limiting the maximum value_len to half the size of INT32. This was applied for all value types, even though it is required only in case of ASF_UNICODE, not for any other ones (like ASCII). get_tag was always allocating a buffer regardless of the datatype, even though this isn't required in case of ASF_BYTE_ARRAY The check for the return value from ff_asf_handle_byte_array() being >0 is removed here because the log message is emitted by the function itself now. Signed-off-by: softworkz --- libavformat/asfdec_f.c | 54 +++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 29b429fee9..58c424b565 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -221,37 +221,63 @@ static uint64_t get_value(AVIOContext *pb, int type, int type2_size) static void get_tag(AVFormatContext *s, const char *key, int type, uint32_t len, int type2_size) { ASFContext *asf = s->priv_data; - char *value = NULL; int64_t off = avio_tell(s->pb); -#define LEN 22 - - av_assert0((unsigned)len < (INT_MAX - LEN) / 2); + char *value = NULL; + uint64_t required_bufferlen; + int buffer_len; if (!asf->export_xmp && !strncmp(key, "xmp", 3)) goto finish; - value = av_malloc(2 * len + LEN); + switch (type) { + case ASF_UNICODE: + required_bufferlen = (uint64_t)len * 2 + 1; + break; + case -1: // ASCII + required_bufferlen = (uint64_t)len + 1; + break; + case ASF_BYTE_ARRAY: + ff_asf_handle_byte_array(s, key, len); + goto finish; + case ASF_BOOL: + case ASF_DWORD: + case ASF_QWORD: + case ASF_WORD: + required_bufferlen = 22; + break; + case ASF_GUID: + required_bufferlen = 33; + break; + default: + required_bufferlen = len; + break; + } + + if (required_bufferlen > INT32_MAX) { + av_log(s, AV_LOG_VERBOSE, "Unable to handle values > INT32_MAX in tag %s.\n", key); + goto finish; + } + + buffer_len = (int)required_bufferlen; + + value = av_malloc(buffer_len); if (!value) goto finish; switch (type) { case ASF_UNICODE: - avio_get_str16le(s->pb, len, value, 2 * len + 1); + avio_get_str16le(s->pb, len, value, buffer_len); break; - case -1: // ASCI - avio_read(s->pb, value, len); - value[len]=0; + case -1: // ASCII + avio_read(s->pb, value, buffer_len - 1); + value[buffer_len - 1] = 0; break; - case ASF_BYTE_ARRAY: - if (ff_asf_handle_byte_array(s, key, len) > 0) - av_log(s, AV_LOG_VERBOSE, "Unsupported byte array in tag %s.\n", key); - goto finish; case ASF_BOOL: case ASF_DWORD: case ASF_QWORD: case ASF_WORD: { uint64_t num = get_value(s->pb, type, type2_size); - snprintf(value, LEN, "%"PRIu64, num); + snprintf(value, buffer_len, "%"PRIu64, num); break; } case ASF_GUID: -- gitgitgadget