From 5d28d1662e6e415367bb283d051e0a690a8ec2f2 Mon Sep 17 00:00:00 2001 From: Uri Lublin Date: Tue, 6 Dec 2011 15:36:38 +0200 Subject: client controller/foreign_menu: use memmove instead of memcpy in readers When src/dst memory areas may overlap, it's safer to use memmove. --- client/controller.cpp | 2 +- client/foreign_menu.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/controller.cpp b/client/controller.cpp index e7c4b955..91c00212 100644 --- a/client/controller.cpp +++ b/client/controller.cpp @@ -216,7 +216,7 @@ bool ControllerConnection::read_msgs() pos += hdr->size; } if (nread > 0 && pos != _read_buf) { - memcpy(_read_buf, pos, nread); + memmove(_read_buf, pos, nread); } _read_pos = _read_buf + nread; return true; diff --git a/client/foreign_menu.cpp b/client/foreign_menu.cpp index 926e266f..00cc57ca 100644 --- a/client/foreign_menu.cpp +++ b/client/foreign_menu.cpp @@ -237,7 +237,7 @@ bool ForeignMenuConnection::read_msgs() pos += hdr->size; } if (nread > 0 && pos != _read_buf) { - memcpy(_read_buf, pos, nread); + memmove(_read_buf, pos, nread); } _read_pos = _read_buf + nread; return true; -- cgit