From 6b72ef0720fa761c018fef93d583e12cfcfa8a64 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sat, 26 Apr 2014 04:09:51 -0400 Subject: [PATCH] change a few memcpy's to strcpy to fix possible segfaults --- src/friendlist.c | 2 +- src/line_info.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/friendlist.c b/src/friendlist.c index ebeb04d..7011199 100644 --- a/src/friendlist.c +++ b/src/friendlist.c @@ -542,7 +542,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m) wmove(self->window, y2 - 1, 1); wattron(self->window, A_BOLD); - wprintw(self->window, " ID: "); + wprintw(self->window, "ID: "); wattroff(self->window, A_BOLD); int i; diff --git a/src/line_info.c b/src/line_info.c index f3de82f..923613a 100644 --- a/src/line_info.c +++ b/src/line_info.c @@ -135,22 +135,22 @@ void line_info_add(ToxWindow *self, uint8_t *tmstmp, uint8_t *name1, uint8_t *na } if (msg) { - memcpy(new_line->msg, msg, sizeof(new_line->msg)); + strcpy(new_line->msg, msg); len += strlen(msg); } if (tmstmp) { - memcpy(new_line->timestamp, tmstmp, sizeof(new_line->timestamp)); + strcpy(new_line->timestamp, tmstmp); len += strlen(tmstmp); } if (name1) { - memcpy(new_line->name1, name1, sizeof(new_line->name1)); + strcpy(new_line->name1, name1); len += strlen(name1); } if (name2) { - memcpy(new_line->name2, name2, sizeof(new_line->name2)); + strcpy(new_line->name2, name2); len += strlen(name2); }