parse_config_key(): return subsection len as size_t

We return the length to a subset of a string using an "int *"
out-parameter. This is fine most of the time, as we'd expect config keys
to be relatively short, but it could behave oddly if we had a gigantic
config key. A more appropriate type is size_t.

Let's switch over, which lets our callers use size_t as appropriate
(they are bound by our type because they must pass the out-parameter as
a pointer). This is mostly just a cleanup to make it clear this code
handles long strings correctly. In practice, our config parser already
chokes on long key names (because of a similar int/size_t mixup!).

When doing an int/size_t conversion, we have to be careful that nobody
was trying to assign a negative value to the variable. I manually
confirmed that for each case here. They tend to just feed the result to
xmemdupz() or similar; in a few cases I adjusted the parameter types for
helper functions to make sure the size_t is preserved.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index 5a77701a15c2068ce91dcffb835335203a5860aa..5ceec3684be910c44216d38e11f240fa4cc22ed3 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -364,7 +364,7 @@ static struct archiver **tar_filters;
 static int nr_tar_filters;
 static int alloc_tar_filters;
 
-static struct archiver *find_tar_filter(const char *name, int len)
+static struct archiver *find_tar_filter(const char *name, size_t len)
 {
        int i;
        for (i = 0; i < nr_tar_filters; i++) {
@@ -380,7 +380,7 @@ static int tar_filter_config(const char *var, const char *value, void *data)
        struct archiver *ar;
        const char *name;
        const char *type;
-       int namelen;
+       size_t namelen;
 
        if (parse_config_key(var, "tar", &name, &namelen, &type) < 0 || !name)
                return 0;

diff --git a/builtin/help.c b/builtin/help.c
index e5590d7787c50af121db0ba7e6221e89c6785df1..c024110531f6c4502bfeed0a91d971b2be47c90b 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -242,7 +242,7 @@ static int add_man_viewer_cmd(const char *name,
 static int add_man_viewer_info(const char *var, const char *value)
 {
        const char *name, *subkey;
-       int namelen;
+       size_t namelen;
 
        if (parse_config_key(var, "man", &name, &namelen, &subkey) < 0 || !name)
                return 0;

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 81dfd563c0d937eb8943f84493d2d48e8af15f1b..52ecf6d43c1010e431c2f408a4acb79a31a1543e 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -459,7 +459,7 @@ static struct reflog_expire_cfg *find_cfg_ent(const char *pattern, size_t len)
 static int reflog_expire_config(const char *var, const char *value, void *cb)
 {
        const char *pattern, *key;
-       int pattern_len;
+       size_t pattern_len;
        timestamp_t expire;
        int slot;
        struct reflog_expire_cfg *ent;

diff --git a/config.c b/config.c
index d17d2bd9dcdef8e4f16316090e1265145834926b..ff7998df4669b374e7f8f5a303ddf966dd236dc4 100644 (file)
--- a/config.c
+++ b/config.c
@@ -309,7 +309,7 @@ int git_config_include(const char *var, const char *value, void *data)
 {
        struct config_include_data *inc = data;
        const char *cond, *key;
-       int cond_len;
+       size_t cond_len;
        int ret;
 
        /*
@@ -3238,7 +3238,7 @@ int config_error_nonbool(const char *var)
 
 int parse_config_key(const char *var,
                     const char *section,
-                    const char **subsection, int *subsection_len,
+                    const char **subsection, size_t *subsection_len,
                     const char **key)
 {
        const char *dot;

diff --git a/config.h b/config.h
index 9b3773f77826513226608a592e3295d7a6ea5e3f..d57df283b37110112a58b01a713a1ee8c108718c 100644 (file)
--- a/config.h
+++ b/config.h
@@ -359,7 +359,7 @@ int git_config_include(const char *name, const char *value, void *data);
  */
 int parse_config_key(const char *var,
                     const char *section,
-                    const char **subsection, int *subsection_len,
+                    const char **subsection, size_t *subsection_len,
                     const char **key);
 
 /**

diff --git a/convert.c b/convert.c
index 5aa87d45e3e5a03b7530fcc36d8a71581250f446..572449825c5a4c8fd1ff65bb0c947d0c567d002b 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -1018,7 +1018,7 @@ static int apply_filter(const char *path, const char *src, size_t len,
 static int read_convert_config(const char *var, const char *value, void *cb)
 {
        const char *key, *name;
-       int namelen;
+       size_t namelen;
        struct convert_driver *drv;
 
        /*

diff --git a/fsck.c b/fsck.c
index 640d813d8430c6835ab1068c0c4512560e91c2b8..41031e459b39e55be175630ea89d99bad8316e00 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -920,7 +920,7 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
 {
        struct fsck_gitmodules_data *data = vdata;
        const char *subsection, *key;
-       int subsection_len;
+       size_t subsection_len;
        char *name;
 
        if (parse_config_key(var, "submodule", &subsection, &subsection_len, &key) < 0 ||

diff --git a/ll-merge.c b/ll-merge.c
index d65a8971db732782822feede96e02f86d336e547..1ec0b959e015b20442aaddc417952f7a7a731d42 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -247,7 +247,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
 {
        struct ll_merge_driver *fn;
        const char *key, *name;
-       int namelen;
+       size_t namelen;
 
        if (!strcmp(var, "merge.default"))
                return git_config_string(&default_ll_merge, var, value);

diff --git a/promisor-remote.c b/promisor-remote.c
index 9f338c945faf997a11d2a55065ddbc14d8be6cdc..ff8721fd56680dcb3b92996ae7ea5e05655b526a 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -101,7 +101,7 @@ static void promisor_remote_move_to_tail(struct promisor_remote *r,
 static int promisor_remote_config(const char *var, const char *value, void *data)
 {
        const char *name;
-       int namelen;
+       size_t namelen;
        const char *subkey;
 
        if (!strcmp(var, "core.partialclonefilter"))

diff --git a/remote.c b/remote.c
index 35bc3f9f2d2bcbf3a737ebfd993bd4c0622fd3d0..534c6426f1e653e6fbb81bd7256a6b3f9d2dfb19 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -305,7 +305,7 @@ static void read_branches_file(struct remote *remote)
 static int handle_config(const char *key, const char *value, void *cb)
 {
        const char *name;
-       int namelen;
+       size_t namelen;
        const char *subkey;
        struct remote *remote;
        struct branch *branch;

diff --git a/submodule-config.c b/submodule-config.c
index 4d1c92d5826da800360a98e88d577f6f25d27f96..e175dfbc388ab50a55429bfff287541bb2a48530 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -225,7 +225,8 @@ static int name_and_item_from_var(const char *var, struct strbuf *name,
                                  struct strbuf *item)
 {
        const char *subsection, *key;
-       int subsection_len, parse;
+       size_t subsection_len;
+       int parse;
        parse = parse_config_key(var, "submodule", &subsection,
                        &subsection_len, &key);
        if (parse < 0 || !subsection)

diff --git a/userdiff.c b/userdiff.c
index efbe05e5a5b6f1aa9a6b92365a4f987f6078dc04..30ab42df8ef2b0a93b007b5afb484ccd4102c3b0 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -222,7 +222,7 @@ static struct userdiff_driver driver_false = {
        { NULL, 0 }
 };
 
-static struct userdiff_driver *userdiff_find_by_namelen(const char *k, int len)
+static struct userdiff_driver *userdiff_find_by_namelen(const char *k, size_t len)
 {
        int i;
        for (i = 0; i < ndrivers; i++) {
@@ -266,7 +266,7 @@ int userdiff_config(const char *k, const char *v)
 {
        struct userdiff_driver *drv;
        const char *name, *type;
-       int namelen;
+       size_t namelen;
 
        if (parse_config_key(k, "diff", &name, &namelen, &type) || !name)
                return 0;