summaryrefslogtreecommitdiff
path: root/archive.h
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2021-02-28 12:22:47 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-11 13:22:44 -0800
commit96099726ddb00b45135964220ce56468ba9fe184 (patch)
tree67511a24e20bf148d232a8595719cb8bf48d4077 /archive.h
parentpretty: document multiple %(describe) being inconsistent (diff)
downloadtgif-96099726ddb00b45135964220ce56468ba9fe184.tar.xz
archive: expand only a single %(describe) per archive
Every %(describe) placeholder in $Format:...$ strings in files with the attribute export-subst is expanded by calling git describe. This can potentially result in a lot of such calls per archive. That's OK for local repositories under control of the user of git archive, but could be a problem for hosted repositories. Expand only a single %(describe) placeholder per archive for now to avoid denial-of-service attacks. We can make this limit configurable later if needed, but let's start out simple. Reported-by: Jeff King <peff@peff.net> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.h')
-rw-r--r--archive.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/archive.h b/archive.h
index 33551b7ee1..49fab71aaf 100644
--- a/archive.h
+++ b/archive.h
@@ -5,6 +5,7 @@
#include "pathspec.h"
struct repository;
+struct pretty_print_context;
struct archiver_args {
struct repository *repo;
@@ -22,6 +23,7 @@ struct archiver_args {
unsigned int convert : 1;
int compression_level;
struct string_list extra_files;
+ struct pretty_print_context *pretty_ctx;
};
/* main api */