diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-10-15 14:42:16 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-10-15 14:42:16 +0000 |
commit | 6c10962089125ab93624e70ec0cb7fbad6bdda34 (patch) | |
tree | 517e562851c752f47e3e13ba499c36d9433939b7 | |
parent | 5f09226e9088614acbf3e915d8bd63afac46e464 (diff) | |
download | gnunet-6c10962089125ab93624e70ec0cb7fbad6bdda34.tar.gz gnunet-6c10962089125ab93624e70ec0cb7fbad6bdda34.zip |
- fix invalid free()
-rw-r--r-- | src/testbed/gnunet-helper-testbed.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 43040e146..523f5f357 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c | |||
@@ -421,7 +421,9 @@ tokenizer_cb (void *cls, void *client, | |||
421 | GNUNET_TESTING_PREFIX "=%s", evstr)); | 421 | GNUNET_TESTING_PREFIX "=%s", evstr)); |
422 | putenv (str); | 422 | putenv (str); |
423 | /* do not free str will be consumed by putenv */ | 423 | /* do not free str will be consumed by putenv */ |
424 | GNUNET_free (evstr); | 424 | str = NULL; |
425 | /* do not free evstr */ | ||
426 | evstr = NULL; | ||
425 | } | 427 | } |
426 | GNUNET_free_non_null (hostname); | 428 | GNUNET_free_non_null (hostname); |
427 | hostname = NULL; | 429 | hostname = NULL; |
@@ -444,7 +446,9 @@ tokenizer_cb (void *cls, void *client, | |||
444 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed"); | 446 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed"); |
445 | /* expose testbed configuration through env variable */ | 447 | /* expose testbed configuration through env variable */ |
446 | GNUNET_assert (0 < GNUNET_asprintf (&evstr, "%s=%s", ENV_TESTBED_CONFIG, config)); | 448 | GNUNET_assert (0 < GNUNET_asprintf (&evstr, "%s=%s", ENV_TESTBED_CONFIG, config)); |
447 | GNUNET_assert (0 == putenv (evstr)); /* Do NOT free evstr; it is consumed by putenv */ | 449 | GNUNET_assert (0 == putenv (evstr)); /* Do NOT free evstr; it is consumed by |
450 | putenv */ | ||
451 | evstr = NULL; | ||
448 | testbed = | 452 | testbed = |
449 | GNUNET_OS_start_process (PIPE_CONTROL, | 453 | GNUNET_OS_start_process (PIPE_CONTROL, |
450 | GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL, | 454 | GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL, |