From 3853a30acf67bf07fcbb7254eafd31da8f749a32 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 9 Sep 2013 06:41:33 -0400 Subject: initialize name_length --- toxcore/Messenger.c | 6 ++++-- toxcore/tox.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 07893e02..3757faf3 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -346,7 +346,7 @@ static int m_sendname(Messenger *m, int friendnumber, uint8_t *name, uint16_t le return write_cryptpacket_id(m, friendnumber, PACKET_ID_NICKNAME, name, length); } -/* Set the name of a friend. +/* Set the name and name_length of a friend. * * return 0 if success. * return -1 if failure. @@ -356,7 +356,9 @@ static int setfriendname(Messenger *m, int friendnumber, uint8_t *name) if (friend_not_valid(m, friendnumber)) return -1; - memcpy(m->friendlist[friendnumber].name, name, MAX_NAME_LENGTH); + uint16_t len = strlen(name) + 1; + m->friendlist[friendnumber].name_length = len; + memcpy(m->friendlist[friendnumber].name, name, len); return 0; } diff --git a/toxcore/tox.c b/toxcore/tox.c index 83b19e9b..54bbd9f0 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c @@ -184,7 +184,7 @@ uint16_t tox_getselfname(void *tox, uint8_t *name, uint16_t nlen) /* Get name of friendnumber and put it in name. * name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes. * - * return 0 if success. + * return length of name (with the NULL terminator) if success. * return -1 if failure. */ int tox_getname(void *tox, int friendnumber, uint8_t *name) -- cgit v1.2.3