From patchwork Mon Aug 13 22:22:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Trimble X-Patchwork-Id: 9980 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3652558jad; Mon, 13 Aug 2018 15:22:55 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwM0YPUmh6znyhlm+2U0jtdKwwrRfmtIfdJlbsLWUm6kLotxcOJAGJ507I0oRp2y+HEuz0l X-Received: by 2002:adf:f790:: with SMTP id q16-v6mr12214055wrp.86.1534198975046; Mon, 13 Aug 2018 15:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534198975; cv=none; d=google.com; s=arc-20160816; b=YViVi3sfNSPgKoEg8h9OBoPxrXkLVRmNtAw9Xd1LtPZS4E40v6NJx2h78cwrBDuGHU HJKHl61FIkfpADL/cqjh2tH3m+LtSi0kHIZGTvKCiw+yQ6lpC3CleWqnhnj0+R6319LN V/PdToAC6rld470HTXWrUTURhNe5kmaRlunsw2lP8Zh5hM5xiP51G4f708ZOWfDgVl/M xPNDwt62Uj8lKIzJz7gGeZCAG0YIs32OSrI6QhFebQKep2TWqPmjSFHm6NUfmc5tNh7c 6o23i9RU/PrjFsJ+S2wD6Q7DZOZv8Z/6kxp9BmbUD4799NpBF9CelOePnsZMstrY5YEp ec+Q== 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:from:mime-version:message-id:date :dkim-signature:delivered-to:arc-authentication-results; bh=eFM+r6kHb1QAteeZxLgWwThcsSl1yBTRGElatUh3HUc=; b=a2QtMsyCsagEmbWwwIoAKeNW2jgbmhqnFADQf7/ZvH32IkEPvw8Gt95p3b4NXaOg9Y 033PhHnZ8qc1DgIYACVebvyTqu+SltY5KcNMuABQeK5Gw7zLJ2fW9D6bSnBFGn/Gb50R Nu9Ns256QQcWdjr8ArUnq6NAmWX26CAMNhlQpS61hkozAT92uECNPp4OHR8ZWSZbtt/E l1YagiqiFqOMvB9K6Y1yHiQ9ZaIQfy9Dwp7xR4dvwHqmmHaPIvp0tKQDv/xSo01Qomx3 jrEqp0VSqgTo5Iiu9Hsx9I4G8YIFqOBQshcSpMnGzbfXl06t2aBapFZ26tpJ7GVNiSoB Qcjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=FRVomH1U; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v21-v6si15598624wrc.122.2018.08.13.15.22.54; Mon, 13 Aug 2018 15:22:55 -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=@google.com header.s=20161025 header.b=FRVomH1U; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB51F6803CB; Tue, 14 Aug 2018 01:22:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f202.google.com (mail-qk0-f202.google.com [209.85.220.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB4E56803CB for ; Tue, 14 Aug 2018 01:22:22 +0300 (EEST) Received: by mail-qk0-f202.google.com with SMTP id 17-v6so18585689qkz.15 for ; Mon, 13 Aug 2018 15:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=zv3Nngk8MzdQzZtzKj5ywvsUjj4OY/RdanrFlap99GQ=; b=FRVomH1U0P7GIZ3wMA3GtRs21uSHNZl9yGAGPdAUvM9gZdkJiTCshtSFAuliV0wjeQ hzfbIon49J6dehGjm3cCeok+mQM/qNcSSvYJR5Dog6QncFBvMGANjKC/ZQs9zCbjlGMp GaS/BReCVDYGkSMiz7yykoibbIWyNeRTg3qBW8dU8cqGaFXZaqMRVKqmMabjUQ1BtmQJ s2bdFNdKOrXyM43Kl/LFk1jZgCL8Kc6YmxgWjDzaQqmRJvhS63+WUqyo2H43vhxA6aeV IdU49b2bHYq9C8IFRbKtVTVDXVYwdKZ+D9ilqm6oszXqultuRGlZ1gJtEqEPRzj74VTU 82Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=zv3Nngk8MzdQzZtzKj5ywvsUjj4OY/RdanrFlap99GQ=; b=JE+YchtDGF9aVACZOzgl7t8vVDvkNaOXk3RyW86ejYKBPT5efz6hqh+WZjwfmOSApw YHt+iKOY58MYH6gpTU8FP3kM+qpOvWIEg719QKtZBESFbamf/1vOQzRgCXgFIX234C02 5fLXw1kOEfYPqQ+iLQ2HZdc/HbITehRN73k1jphkyiZtPGK6hEoJsDX6bpshNQWMYBe+ 2GAVhmGusSrbEQJDeaJVmDCl8K9TKWPPaX/Y792UslsJZj2IlvneyPYBt1TdD/OdgeUo WH0/X6eCZFSlNbUkxPcK6Voopb+spdLkeNU2bzIEuDAKi2plgeVXDrBXsdQqZC5Wg1WU uS2g== X-Gm-Message-State: AOUpUlET7wcp3a4dkOHhzMT4ZAb541HHf2RY/kgeRr2VsfNu4o1Rko5g PLYTaQYPTqWcjtbUxKYgF18ibzBJB7Kg6W3dQbmhIIQfO8wLvje/V7oie25g+Ikqbej8XddxvKj cgLeW48Lj8XSmtB3THxIFIKlbJhvGsLTuDHnxwSxvPL1jYNhmlAeCrPkc183A7Vn2Mepd X-Received: by 2002:a0c:f886:: with SMTP id u6-v6mr10803762qvn.48.1534198964984; Mon, 13 Aug 2018 15:22:44 -0700 (PDT) Date: Mon, 13 Aug 2018 15:22:28 -0700 Message-Id: <20180813222228.34818-1-modmaker@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog From: Jacob Trimble To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avutil/encryption_info: Fix size calculation. 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: Jacob Trimble Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: 873693 Signed-off-by: Jacob Trimble --- libavutil/encryption_info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/encryption_info.c b/libavutil/encryption_info.c index c3916b42c8..b399e07e66 100644 --- a/libavutil/encryption_info.c +++ b/libavutil/encryption_info.c @@ -300,14 +300,14 @@ uint8_t *av_encryption_init_info_add_side_data(const AVEncryptionInitInfo *info, temp_side_data_size = 4; init_info_count = 0; for (cur_info = info; cur_info; cur_info = cur_info->next) { - temp_side_data_size += (uint64_t)FF_ENCRYPTION_INIT_INFO_EXTRA + info->system_id_size + info->data_size; + temp_side_data_size += (uint64_t)FF_ENCRYPTION_INIT_INFO_EXTRA + cur_info->system_id_size + cur_info->data_size; if (init_info_count == UINT32_MAX || temp_side_data_size > UINT32_MAX) { return NULL; } init_info_count++; - if (info->num_key_ids) { - temp_side_data_size += (uint64_t)info->num_key_ids * info->key_id_size; + if (cur_info->num_key_ids) { + temp_side_data_size += (uint64_t)cur_info->num_key_ids * cur_info->key_id_size; if (temp_side_data_size > UINT32_MAX) { return NULL; }