X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fencryption_info.c;h=dd3fa71a44c48dd467d68da9255175db3852aa2e;hb=7d09579190def3ef7562399489e628f3b65714ce;hp=812c7047769978307556a0a9805d19727468cde2;hpb=47e12966b75490cfa5fb8ed65a48a9a3d84a7bce;p=ffmpeg

diff --git a/libavutil/encryption_info.c b/libavutil/encryption_info.c
index 812c7047769..dd3fa71a44c 100644
--- a/libavutil/encryption_info.c
+++ b/libavutil/encryption_info.c
@@ -331,8 +331,10 @@ uint8_t *av_encryption_init_info_add_side_data(const AVEncryptionInitInfo *info,
             memcpy(cur_buffer, cur_info->key_ids[i], cur_info->key_id_size);
             cur_buffer += cur_info->key_id_size;
         }
-        memcpy(cur_buffer, cur_info->data, cur_info->data_size);
-        cur_buffer += cur_info->data_size;
+        if (cur_info->data_size > 0) {
+            memcpy(cur_buffer, cur_info->data, cur_info->data_size);
+            cur_buffer += cur_info->data_size;
+        }
     }
 
     return buffer;