summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2011-12-06 15:36:38 +0200
committerUri Lublin <uril@redhat.com>2011-12-20 18:27:32 +0200
commit5d28d1662e6e415367bb283d051e0a690a8ec2f2 (patch)
treec6af5edfb95f43ad1ff92c35b4c9650f4710bf5b
parentffc4de01e6f9ea0676f17b10e45a137d7e15d6ac (diff)
downloadspice-5d28d1662e6e415367bb283d051e0a690a8ec2f2.tar.gz
spice-5d28d1662e6e415367bb283d051e0a690a8ec2f2.tar.xz
spice-5d28d1662e6e415367bb283d051e0a690a8ec2f2.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.
-rw-r--r--client/controller.cpp2
-rw-r--r--client/foreign_menu.cpp2
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;