diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-11-16 07:43:22 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-11-16 07:43:22 +0000 |
| commit | aa6616d2e504bddaf27a03338a97f98bb3e00d8c (patch) | |
| tree | 6f1c53b2597f2612af8afaed9181ad3d47a12436 /src | |
| parent | 2095da49797ef75ed425c8dd69dcda5f92e11ff8 (diff) | |
fix #4054
Diffstat (limited to 'src')
| -rw-r--r-- | src/testbed/gnunet-daemon-testbed-blacklist.c | 12 | ||||
| -rw-r--r-- | src/testbed/gnunet-helper-testbed.c | 13 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c index 57e319c2ac..9492788fc0 100644 --- a/src/testbed/gnunet-daemon-testbed-blacklist.c +++ b/src/testbed/gnunet-daemon-testbed-blacklist.c @@ -212,7 +212,7 @@ run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) { char *shome; - char fname[PATH_MAX]; + char *fname; if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "PATHS", "GNUNET_HOME", @@ -221,15 +221,21 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_break (0); return; } - GNUNET_assert (0 < GNUNET_snprintf (fname, PATH_MAX, "%s/whitelist", shome)); + GNUNET_asprintf (&fname, + "%s/whitelist", + shome); if (GNUNET_YES == GNUNET_DISK_file_test (fname)) { mode = ACCESS_ALLOW; setup_ac (fname, c); GNUNET_free (shome); + GNUNET_free (fname); return; } - GNUNET_assert (0 < GNUNET_snprintf (fname, PATH_MAX, "%s/blacklist", shome)); + GNUNET_asprintf (&fname, + "%s/blacklist", + shome); + GNUNET_free (fname); if (GNUNET_YES == GNUNET_DISK_file_test (fname)) { mode = ACCESS_DENY; diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 34640e4831..13f6c0c891 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c @@ -420,13 +420,16 @@ tokenizer_cb (void *cls, void *client, if (NULL != evstr) { #ifdef WINDOWS - GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, evstr)); + GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, + evstr)); #else - static char evar[2* PATH_MAX]; + char *evar; - GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar), - GNUNET_TESTING_PREFIX "=%s", evstr)); - putenv (evar); + GNUNET_asprintf (&evar, + GNUNET_TESTING_PREFIX "=%s", + evstr); + putenv (evar); /* consumes 'evar', + see putenv(): becomes part of envrionment! */ #endif GNUNET_free (evstr); evstr = NULL; |