diff options
| author | Uri Lublin <uril@redhat.com> | 2011-12-06 15:36:38 +0200 |
|---|---|---|
| committer | Uri Lublin <uril@redhat.com> | 2011-12-21 12:58:07 +0200 |
| commit | baa375e8b51de94ee44466fe416202c29ea43e23 (patch) | |
| tree | a8c7b1637432ffac6a57478a796273d8c41db276 | |
| parent | 1f2d55b38b7a0628c20385f306533f4e6bd66d7f (diff) | |
| download | spice-baa375e8b51de94ee44466fe416202c29ea43e23.tar.gz spice-baa375e8b51de94ee44466fe416202c29ea43e23.tar.xz spice-baa375e8b51de94ee44466fe416202c29ea43e23.zip | |
client controller/foreign_menu: use memmove instead of memcpy in readers
When src/dst memory areas may overlap, it's safer to use memmove.
(cherry picked from commit 5d28d1662e6e415367bb283d051e0a690a8ec2f2)
| -rw-r--r-- | client/controller.cpp | 2 | ||||
| -rw-r--r-- | client/foreign_menu.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/controller.cpp b/client/controller.cpp index 42abe20f..3fed47f2 100644 --- a/client/controller.cpp +++ b/client/controller.cpp @@ -213,7 +213,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 e5d7459d..988583a0 100644 --- a/client/foreign_menu.cpp +++ b/client/foreign_menu.cpp @@ -234,7 +234,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; |