[PATCH] http.postbuffer: make a size_t
From: David Turner <hidden>
Date: 2017-03-30 20:29:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
Unfortunately, in order to push some large repos, the http postbuffer must sometimes exceed two gigabytes. On a 64-bit system, this is OK: we just malloc a larger buffer. Signed-off-by: David Turner <redacted> --- cache.h | 1 + config.c | 17 +++++++++++++++++ http.c | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/cache.h b/cache.h
index fbdf7a815a..a8c1b65db0 100644
--- a/cache.h
+++ b/cache.h@@ -1900,6 +1900,7 @@ extern int git_parse_maybe_bool(const char *); extern int git_config_int(const char *, const char *); extern int64_t git_config_int64(const char *, const char *); extern unsigned long git_config_ulong(const char *, const char *); +extern size_t git_config_size_t(const char *, const char *); extern int git_config_bool_or_int(const char *, const char *, int *); extern int git_config_bool(const char *, const char *); extern int git_config_maybe_bool(const char *, const char *);
diff --git a/config.c b/config.c
index 1a4d85537b..7b706cf27a 100644
--- a/config.c
+++ b/config.c@@ -834,6 +834,15 @@ int git_parse_ulong(const char *value, unsigned long *ret) return 1; } +static size_t git_parse_size_t(const char *value, unsigned long *ret) +{ + size_t tmp; + if (!git_parse_signed(value, &tmp, maximum_unsigned_value_of_type(size_t))) + return 0; + *ret = tmp; + return 1; +} + NORETURN static void die_bad_number(const char *name, const char *value) {
@@ -892,6 +901,14 @@ unsigned long git_config_ulong(const char *name, const char *value) return ret; } +size_t git_config_size_t(const char *name, const char *value) +{ + unsigned long ret; + if (!git_parse_size_t(value, &ret)) + die_bad_number(name, value); + return ret; +} + int git_parse_maybe_bool(const char *value) { if (!value)
diff --git a/http.c b/http.c
index 96d84bbed3..ab6080835f 100644
--- a/http.c
+++ b/http.c@@ -331,7 +331,7 @@ static int http_options(const char *var, const char *value, void *cb) } if (!strcmp("http.postbuffer", var)) { - http_post_buffer = git_config_int(var, value); + http_post_buffer = git_config_size_t(var, value); if (http_post_buffer < LARGE_PACKET_MAX) http_post_buffer = LARGE_PACKET_MAX; return 0;
--
2.11.GIT