summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeron Johnson <deron.johnson@sun.com>2005-01-06 19:57:00 +0000
committerDeron Johnson <deron.johnson@sun.com>2005-01-06 19:57:00 +0000
commit90f7c3dcaecf54971b20e978f7060f0aac257224 (patch)
treed1a15d7fd020224cd135ddcc611b3022afe2665e
parent90b1782cf132d4d3a753e4643fe8c398cecbb07b (diff)
Integrate 6.8.2 RC2 changes.lg3d-dev-0-6-1
-rw-r--r--src/dmx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dmx.c b/src/dmx.c
index 0f9c099..33aa87b 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -424,7 +424,7 @@ Bool DMXAddScreen(Display *dpy, const char *displayName, unsigned int mask,
if (length) {
char *buffer = Xmalloc(paddedLength);
memset(buffer, 0, paddedLength);
- strcpy(buffer, displayName);
+ memcpy(buffer, displayName, length);
Data32(dpy, buffer, paddedLength);
Xfree(buffer);
}
@@ -730,7 +730,7 @@ Bool DMXAddInput(Display *dpy, unsigned int mask, DMXInputAttributes *attr,
if (length) {
char *buffer = Xmalloc(paddedLength);
memset(buffer, 0, paddedLength);
- strcpy(buffer, attr->name);
+ memcpy(buffer, attr->name, paddedLength);
Data32(dpy, buffer, paddedLength);
Xfree(buffer);
}