diff options
| author | Uri Lublin <uril@redhat.com> | 2011-12-06 15:36:38 +0200 |
|---|---|---|
| committer | Uri Lublin <uril@redhat.com> | 2011-12-21 19:58:15 +0200 |
| commit | 0a13f2c03e3ba5895b43732adff493b8af1b1108 (patch) | |
| tree | aabd60b9c31aa95294d714563f82059acbd6ba3c | |
| parent | 29e6de4e3ca34624b064e54dac25b394c311d47f (diff) | |
| download | spice-0a13f2c03e3ba5895b43732adff493b8af1b1108.tar.gz spice-0a13f2c03e3ba5895b43732adff493b8af1b1108.tar.xz spice-0a13f2c03e3ba5895b43732adff493b8af1b1108.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 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; |