diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2021-11-29 12:43:25 +0100 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2021-11-29 12:43:25 +0100 |
commit | f8beb38c5e813ace4799cef75232f6e5c6b3a67b (patch) | |
tree | 25bd832d3a7a0ffbd89ff007056ba3144bdf5abd /src/messenger/gnunet-service-messenger_handle.c | |
parent | fdb9fc3b6f1333a05e093ed1a8aee63d6308ced1 (diff) | |
download | gnunet-f8beb38c5e813ace4799cef75232f6e5c6b3a67b.tar.gz gnunet-f8beb38c5e813ace4799cef75232f6e5c6b3a67b.zip |
-fix messenger load-, store-operations and uninitialized memory
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat (limited to 'src/messenger/gnunet-service-messenger_handle.c')
-rw-r--r-- | src/messenger/gnunet-service-messenger_handle.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/messenger/gnunet-service-messenger_handle.c b/src/messenger/gnunet-service-messenger_handle.c index fa6830697..341bb7251 100644 --- a/src/messenger/gnunet-service-messenger_handle.c +++ b/src/messenger/gnunet-service-messenger_handle.c | |||
@@ -598,6 +598,11 @@ callback_scan_for_rooms (void *cls, | |||
598 | { | 598 | { |
599 | struct GNUNET_MESSENGER_SrvHandle *handle = cls; | 599 | struct GNUNET_MESSENGER_SrvHandle *handle = cls; |
600 | 600 | ||
601 | if ((strlen(filename) <= 4) || (0 != strcmp(filename + strlen(filename) - 4, ".cfg"))) | ||
602 | return GNUNET_OK; | ||
603 | |||
604 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Load room configuration of handle: %s\n", filename); | ||
605 | |||
601 | struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); | 606 | struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); |
602 | 607 | ||
603 | if ((GNUNET_YES == GNUNET_DISK_file_test (filename)) && (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename))) | 608 | if ((GNUNET_YES == GNUNET_DISK_file_test (filename)) && (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename))) |
@@ -649,9 +654,10 @@ iterate_save_rooms (void *cls, | |||
649 | 654 | ||
650 | char *filename; | 655 | char *filename; |
651 | GNUNET_asprintf (&filename, "%s%s%c%s.cfg", id_dir, "rooms", DIR_SEPARATOR, GNUNET_h2s (key)); | 656 | GNUNET_asprintf (&filename, "%s%s%c%s.cfg", id_dir, "rooms", DIR_SEPARATOR, GNUNET_h2s (key)); |
652 | |||
653 | GNUNET_free(id_dir); | 657 | GNUNET_free(id_dir); |
654 | 658 | ||
659 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Save room configuration of handle: %s\n", filename); | ||
660 | |||
655 | struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); | 661 | struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); |
656 | 662 | ||
657 | char *key_data = GNUNET_STRINGS_data_to_string_alloc (key, sizeof(*key)); | 663 | char *key_data = GNUNET_STRINGS_data_to_string_alloc (key, sizeof(*key)); |