Merge pull request #645 from FullName/nTox-patches

nTox: enforce friend name null termination, reduce memory loss, allow nickchange as oldname=>newname

1 files changed, 7 insertions, 4 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 659c837b..66faa4db 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1539,12 +1539,15 @@ void do_friends(Messenger *m)
                         if (data_length >= MAX_NAME_LENGTH || data_length == 0)
                             break;
 
-                        memcpy(m->friendlist[i].name, data, data_length);
-                        m->friendlist[i].name_length = data_length;
-                        m->friendlist[i].name[data_length - 1] = 0; /* Make sure the NULL terminator is present. */
+                        /* Make sure the NULL terminator is present. */
+                        data[data_length - 1] = 0;
 
+                        /* inform of namechange before we overwrite the old name */
                         if (m->friend_namechange)
-                            m->friend_namechange(m, i, m->friendlist[i].name, data_length, m->friend_namechange_userdata);
+                            m->friend_namechange(m, i, data, data_length, m->friend_namechange_userdata);
+
+                        memcpy(m->friendlist[i].name, data, data_length);
+                        m->friendlist[i].name_length = data_length;
 
                         break;
                     }