summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-06 13:24:29 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-06 13:24:29 +0000
commit260009f58959021e46ae7926dfc9da12caafd5ee (patch)
treeaa8ff428eee9360357d31e71355311b50581eea2
parentfe29169f363b143eee5d290d5388c460c45d41ba (diff)
downloadxorg-app-xauth-260009f58959021e46ae7926dfc9da12caafd5ee.tar.gz
merge XFree86 4.3.99.901 (RC1) from vendor branchXEVIE-BASE
-rw-r--r--process.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/process.c b/process.c
index ee5b41b..5d7d2ba 100644
--- a/process.c
+++ b/process.c
@@ -26,7 +26,8 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xauth/process.c,v 3.22 2003/07/18 15:53:28 tsi Exp $ */
+/* $XdotOrg: xc/programs/xauth/process.c,v 3.23 2003/11/25 03:15:04 dawes Exp $ */
+/* $XFree86: xc/programs/xauth/process.c,v 3.23 2003/11/25 03:15:04 dawes Exp $ */
/*
* Author: Jim Fulton, MIT X Consortium
@@ -1520,7 +1521,7 @@ do_add(char *inputfilename, int lineno, int argc, char **argv)
return 1;
}
auth->data_length = len;
- auth->data = copystring(key, len);
+ auth->data = malloc(len);
if (!auth->data) {
prefix(inputfilename, lineno);
fprintf(stderr, "unable to allocate %d bytes for key\n", len);
@@ -1532,6 +1533,7 @@ do_add(char *inputfilename, int lineno, int argc, char **argv)
free(key);
return 1;
}
+ memcpy(auth->data, key, len);
}
free(key);
/*