diff options
| author | Simo Sorce <simo@redhat.com> | 2013-11-16 17:08:06 -0500 |
|---|---|---|
| committer | Günther Deschner <gdeschner@redhat.com> | 2013-11-20 15:48:45 +0100 |
| commit | 1d78d1af3da7eeb15aa1f054b740f31a12f48f31 (patch) | |
| tree | bc3f4a67eb6d083a7ded687aba1fb360cdac6044 | |
| parent | c8386418a754211da5ddf5469a0f1c0fddf21240 (diff) | |
| download | gss-proxy-1d78d1af3da7eeb15aa1f054b740f31a12f48f31.tar.gz gss-proxy-1d78d1af3da7eeb15aa1f054b740f31a12f48f31.tar.xz gss-proxy-1d78d1af3da7eeb15aa1f054b740f31a12f48f31.zip | |
config: Do not modify const strings
Take a copy here, the option string is const and strtok_r() is not a safe
function as it may change the string it manipulates.
Reviewed-by: Günther Deschner <gdeschner@redhat.com>
| -rw-r--r-- | proxy/src/gp_config.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c index e21e70d..63f264e 100644 --- a/proxy/src/gp_config.c +++ b/proxy/src/gp_config.c @@ -209,6 +209,7 @@ static int load_services(struct gp_config *cfg, struct gp_ini_context *ctx) int num_sec; char *secname = NULL; const char *value; + char *vcopy; char *token; char *handle; int valnum; @@ -318,7 +319,12 @@ static int load_services(struct gp_config *cfg, struct gp_ini_context *ctx) goto done; } - token = strtok_r(no_const(value), ", ", &handle); + vcopy = strdup(value); + if (!vcopy) { + ret = ENOMEM; + goto done; + } + token = strtok_r(vcopy, ", ", &handle); do { ret = strcmp(value, "krb5"); @@ -329,6 +335,7 @@ static int load_services(struct gp_config *cfg, struct gp_ini_context *ctx) } else { GPERROR("Failed to read krb5 config for %s.\n", secname); + safefree(vcopy); return ret; } } else { @@ -338,6 +345,7 @@ static int load_services(struct gp_config *cfg, struct gp_ini_context *ctx) token = strtok_r(NULL, ", ", &handle); } while (token != NULL); + safefree(vcopy); if (cfg->svcs[n]->mechs == 0) { GPDEBUG("No mechs found for [%s], ignoring.\n", secname); |