mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix remaining memory leaks

Browse source
This commit is contained in:
Ola Bini 2016-01-12 12:33:05 -05:00
parent ee39869f67
commit fcd7923a96
No known key found for this signature in database
GPG key ID: 465757AF3914B4B7
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/test/test_dir.c
View file

@ -6,6 +6,7 @@
#include "orconfig.h" #include "orconfig.h"
#include <math.h> #include <math.h>
#define CONFIG_PRIVATE
#define DIRSERV_PRIVATE #define DIRSERV_PRIVATE
#define DIRVOTE_PRIVATE #define DIRVOTE_PRIVATE
#define ROUTER_PRIVATE #define ROUTER_PRIVATE
@ -15,6 +16,7 @@
#define RELAY_PRIVATE #define RELAY_PRIVATE
#include "or.h" #include "or.h"
#include "confparse.h"
#include "config.h" #include "config.h"
#include "crypto_ed25519.h" #include "crypto_ed25519.h"
#include "directory.h" #include "directory.h"
@ -587,6 +589,7 @@ test_dir_extrainfo_parsing(void *arg)
#undef CHECK_FAIL #undef CHECK_FAIL
done: done:
escaped(NULL);
memarea_clear_freelist(); memarea_clear_freelist();
extrainfo_free(ei); extrainfo_free(ei);
routerinfo_free(ri); routerinfo_free(ri);
@ -3527,20 +3530,31 @@ static void
test_dir_authdir_type_to_string(void *data) test_dir_authdir_type_to_string(void *data)
{ {
(void)data; (void)data;
char *res;
tt_str_op(authdir_type_to_string(NO_DIRINFO), OP_EQ, tt_str_op(res = authdir_type_to_string(NO_DIRINFO), OP_EQ,
"[Not an authority]");
tt_str_op(authdir_type_to_string(EXTRAINFO_DIRINFO), OP_EQ,
"[Not an authority]");
tt_str_op(authdir_type_to_string(MICRODESC_DIRINFO), OP_EQ,
"[Not an authority]"); "[Not an authority]");
tor_free(res);
tt_str_op(authdir_type_to_string(V3_DIRINFO), OP_EQ, "V3"); tt_str_op(res = authdir_type_to_string(EXTRAINFO_DIRINFO), OP_EQ,
tt_str_op(authdir_type_to_string(BRIDGE_DIRINFO), OP_EQ, "Bridge"); "[Not an authority]");
tt_str_op(authdir_type_to_string( tor_free(res);
tt_str_op(res = authdir_type_to_string(MICRODESC_DIRINFO), OP_EQ,
"[Not an authority]");
tor_free(res);
tt_str_op(res = authdir_type_to_string(V3_DIRINFO), OP_EQ, "V3");
tor_free(res);
tt_str_op(res = authdir_type_to_string(BRIDGE_DIRINFO), OP_EQ, "Bridge");
tor_free(res);
tt_str_op(res = authdir_type_to_string(
V3_DIRINFO | BRIDGE_DIRINFO | EXTRAINFO_DIRINFO), OP_EQ, V3_DIRINFO | BRIDGE_DIRINFO | EXTRAINFO_DIRINFO), OP_EQ,
"V3, Bridge"); "V3, Bridge");
done: ; done:
tor_free(res);
} }
static void static void
@ -3644,7 +3658,7 @@ test_dir_should_use_directory_guards(void *data)
done: done:
NS_UNMOCK(public_server_mode); NS_UNMOCK(public_server_mode);
tor_free(options); or_options_free(options);
tor_free(errmsg); tor_free(errmsg);
} }