From 2dbe442005401656c73b3432b5798219fa8b5432 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Tue, 23 Jul 2019 13:38:08 +0200 Subject: [PATCH] fix mem corruption, possibly #5581 --- src/testbed/gnunet-service-testbed.c | 11 +++++------ src/testbed/gnunet-service-testbed.h | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 289e17349..8babeeb13 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c @@ -11,7 +11,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -65,7 +65,7 @@ struct OperationQueue *GST_opq_openfds; /** * Timeout for operations which may take some time */ -const struct GNUNET_TIME_Relative GST_timeout; +struct GNUNET_TIME_Relative GST_timeout; /** * The size of the host list @@ -860,23 +860,22 @@ testbed_run (void *cls, } GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, - "TESTBED", + "testbed", "CACHE_SIZE", &num)); GST_cache_init ((unsigned int) num); GST_connection_pool_init ((unsigned int) num); GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, - "TESTBED", + "testbed", "MAX_OPEN_FDS", &num)); GST_opq_openfds = GNUNET_TESTBED_operation_queue_create_ (OPERATION_QUEUE_TYPE_FIXED, (unsigned int) num); GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_get_value_time (cfg, - "TESTBED", + "testbed", "OPERATION_TIMEOUT", - (struct GNUNET_TIME_Relative *) &GST_timeout)); GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h index 0960e9cc5..5e835392b 100644 --- a/src/testbed/gnunet-service-testbed.h +++ b/src/testbed/gnunet-service-testbed.h @@ -11,7 +11,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -454,7 +454,7 @@ extern struct OperationQueue *GST_opq_openfds; /** * Timeout for operations which may take some time */ -const extern struct GNUNET_TIME_Relative GST_timeout; +extern struct GNUNET_TIME_Relative GST_timeout; /** * The size of the peer list -- 2.25.1