diff mbox

[FFmpeg-devel] avutil/encryption_info: Fix size calculation.

Message ID 20180813222228.34818-1-modmaker@google.com
State Accepted
Commit 67599812a36a5cc727522760b56930868f93ba0d
Headers show

Commit Message

Jacob Trimble Aug. 13, 2018, 10:22 p.m. UTC 
Fixes: 873693
Signed-off-by: Jacob Trimble <modmaker@google.com>
---
 libavutil/encryption_info.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Carl Eugen Hoyos Aug. 13, 2018, 10:31 p.m. UTC | #1 
2018-08-14 0:22 GMT+02:00, Jacob Trimble <modmaker-at-google.com@ffmpeg.org>:
> Fixes: 873693

This does not look helpful.

Carl Eugen
diff mbox

Patch

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;
             }