From 9c1a4a3542eb65ce6b13a8f8d6a48d023fbfdf65 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Mon, 3 Apr 2017 09:48:40 -0700 Subject: [PATCH] Only create deltas between two regular files For three different Clear Linux OS builds in the last few months, deltas were created between files with type change L->F (symlink to file). This was allowed to occur because there is no check if file->peer->is_link in __create_delta(). Instead, remove the file->is_link check and simply ensure that the from/to file types are both F (i.e. "regular file"). Signed-off-by: Patrick McCarty --- src/delta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/delta.c b/src/delta.c index ad40820..47f81dd 100644 --- a/src/delta.c +++ b/src/delta.c @@ -40,8 +40,8 @@ void __create_delta(struct file *file, int from_version, char *from_hash) char *original, *newfile, *outfile, *dotfile, *testnewfile, *conf; int ret; - if (file->is_link) { - return; + if (!file->is_file || !file->peer->is_file) { + return; /* only support deltas between two regular files right now */ } if (file->is_deleted) {