From patchwork Sun May 8 03:01:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35691 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2387020pzb; Sat, 7 May 2022 20:02:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgCaUaE58E4PJe4T5RWjnFG/dMQahVGKMv9WIx/Tp5Tpcp6Qwo5tLXERCwZxNHyaLNtE/8 X-Received: by 2002:a17:906:3a45:b0:6f4:e9e7:4ff with SMTP id a5-20020a1709063a4500b006f4e9e704ffmr9083383ejf.100.1651978933625; Sat, 07 May 2022 20:02:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651978933; cv=none; d=google.com; s=arc-20160816; b=HPHhmE6N0QUJLn+3McJog4f1/ZyUqz5aV19Uz3tg1LRddMu0UzxiH6x+3DR9X/i5wd M6H8O3Yln3p3zVRjxEES3UEH8WwLwF+nDqnQVmmaBl9a1KG9lySezvtCGFUnqRM5ezya e99mLGn90aeVz6eCMnuWFMyMr/gPcgC/3Xqa1BixybhcRW2zj7q+z9uZn+XbSFpoZT1D avZwDUgWdwlvaerTUm15ioc5sa+l+aej5LMvBEUWNwTwPNjDNpaJ+HkbAD+zBJtongxy xM7eqvUANFkM48a8AYVo2iSmHmohNncH1AxQ8ZPKJxJ1VJbIllLSX4mLNHyjEkv8QG9p x85A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=3QvK3GnZB+IeCFGp7qkGRyL+PtWF3kZ7da4Edhzd1sU=; b=uPfNhnSe/V42rSDlpwUqoO0CrgMAloTydqEUDeN4hhZp8fYoPudXInJGS1Os9yjj8D YVgcGe9mE0EhOOe1/9EURpeaWMs/yXiZ2QHNqbo45oAiZj9tBpg3u5H6vYLWBV/YoEdS pI0oOxR+v2CC20xMXChOFUWEs1pUNku+WHK9J62B9qfUDKUgx5T4WOTe9hF9BMSdikFb Bj7mc8uhIkSdHPCoV8UYhVlxoYFQ+FyboQmn9biSM2SoknRFDrJRm19maTwpKCkpnTGk UgS70qpo8G25OlsAVo/PKskcQ1JbvjfEA3hGLxE4Kf9EesHqTbSSBzSJbSv8LafoNeQs lPvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WBEuy2Oy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id la8-20020a170906ad8800b006e8439e78cesi9270482ejb.105.2022.05.07.20.02.13; Sat, 07 May 2022 20:02:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WBEuy2Oy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7597168B3D9; Sun, 8 May 2022 06:01:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 482A368B3C5 for ; Sun, 8 May 2022 06:01:29 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id 7so9272270pga.12 for ; Sat, 07 May 2022 20:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=X9PSGQ/qjsdRhuEM6meqrojVfgFzi+t8Il41omMHEdQ=; b=WBEuy2OydeznUHtMmhG+1sAfRgx7YtWKNBpBegQenUOPecRKI9G+Q8CBwBXNMzUQPv 3KBzax2v07vEN4dflb7098a4V41Chb7lirZ5A3LoqwVsS2YDkoly8CJKsRkrjh1S7aLq vtWUkOks6Fc7Fghe9f/oFYz0jItUuBoj6t11bGZuoSiNDyX+mTPbqxvlOXe9lI0IaIJq 1H02xc8M2CImlhtFhpa+izNSRS4rVMrHAJUJSipAtygvDbnMJL6Pp0vT71iqgvguDjXn KpPygM+eBNYkLMbx2NFBwN9kCkC0XVk3u98IS7tIwA6zAOx8gGFrSKyyVXXzJGpd07y6 xC+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=X9PSGQ/qjsdRhuEM6meqrojVfgFzi+t8Il41omMHEdQ=; b=LIpb8jm0LzXrAh7q3+PFMMPfRo0ZNWSr1+NBFnd9TYyAZgkPrUPS4c7BHazQe1PTij HiyipZN1UZhSyBivm0HUC3caCbSp9BxekjUBSjDVLpO751w4YFggP00c2pUMYthbfWG6 hBYk+IqkYWbK++/xlPuSfvkFnTBssGFli/TIhzQMnq2mTXk6BcOhlMAy8lmQjVNyznsy NzMKxvJAUoDsEJXIqImBeTJTWlmPIl/eoR694A25Lzrg4VztIjJ8I5ERKN45cQzOTmm2 TF8KbxxzNEnQDSOX/+AebJ8Ml1yHaA1bv6gmbe6/VY2hcUAKs44nVJApq02+z4QBsbNp wmtA== X-Gm-Message-State: AOAM531XAwiSKmEl14ZQgvNHH3HZtE+vsF6N2n159efl2sZBTdJowhHl LVizclGEKyxsPCCpla6aHpBKLqf4erPsBQ== X-Received: by 2002:a05:6a00:1ad2:b0:510:72f6:d039 with SMTP id f18-20020a056a001ad200b0051072f6d039mr9915855pfv.2.1651978887684; Sat, 07 May 2022 20:01:27 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id ay28-20020a056a00301c00b0050dc76281cbsm5685590pfb.165.2022.05.07.20.01.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 May 2022 20:01:27 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Sun, 08 May 2022 03:01:15 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 04/11] libavformat/asfdec: fixing get_tag 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: Michael Niedermayer , softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dbTYl2/Ta7EC 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 3014ef558d..8071325a2f 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: