diff options
author | irungentoo <irungentoo@gmail.com> | 2015-07-09 22:20:50 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2015-07-09 22:20:50 -0400 |
commit | 964233b0bf8240e70bb8bfddce17262756171231 (patch) | |
tree | 7abec4aecfcddf3a447bff05b5bf9d10ada07a24 | |
parent | 970c2cccf3bc1629e46fc186f523dc89d05ea004 (diff) | |
parent | 0168d53a1d6bb4654ee0737298f48b5beb66f725 (diff) |
Merge branch 'fix_segfault' of https://github.com/JFreegman/toxcore
-rw-r--r-- | toxcore/Messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 6ec5a796..c8c0042f 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c | |||
@@ -1803,8 +1803,8 @@ Messenger *new_messenger(Messenger_Options *options, unsigned int *error) | |||
1803 | kill_onion(m->onion); | 1803 | kill_onion(m->onion); |
1804 | kill_onion_announce(m->onion_a); | 1804 | kill_onion_announce(m->onion_a); |
1805 | kill_onion_client(m->onion_c); | 1805 | kill_onion_client(m->onion_c); |
1806 | kill_DHT(m->dht); | ||
1807 | kill_net_crypto(m->net_crypto); | 1806 | kill_net_crypto(m->net_crypto); |
1807 | kill_DHT(m->dht); | ||
1808 | kill_networking(m->net); | 1808 | kill_networking(m->net); |
1809 | free(m); | 1809 | free(m); |
1810 | return NULL; | 1810 | return NULL; |
@@ -1818,8 +1818,8 @@ Messenger *new_messenger(Messenger_Options *options, unsigned int *error) | |||
1818 | kill_onion(m->onion); | 1818 | kill_onion(m->onion); |
1819 | kill_onion_announce(m->onion_a); | 1819 | kill_onion_announce(m->onion_a); |
1820 | kill_onion_client(m->onion_c); | 1820 | kill_onion_client(m->onion_c); |
1821 | kill_DHT(m->dht); | ||
1822 | kill_net_crypto(m->net_crypto); | 1821 | kill_net_crypto(m->net_crypto); |
1822 | kill_DHT(m->dht); | ||
1823 | kill_networking(m->net); | 1823 | kill_networking(m->net); |
1824 | free(m); | 1824 | free(m); |
1825 | 1825 | ||