[xorg-commit-diffs] xc/lib/Xi XGetProp.c, 1.1.4.2, 1.1.4.3 XSelect.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/Xi
In directory pdx:/home/eich/tstbuild/xc/lib/Xi

Modified Files:
      Tag: XORG-CURRENT
	XGetProp.c XSelect.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: XGetProp.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xi/XGetProp.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/XGetProp.c	5 Mar 2004 13:39:25 -0000	1.1.4.2
+++ b/XGetProp.c	15 Apr 2004 10:15:04 -0000	1.1.4.3
@@ -93,7 +93,7 @@
     if (*count)
 	{
 	rlen = rep.length << 2;
-	list = (XEventClass *) Xmalloc (rlen);
+	list = (XEventClass *) Xmalloc (rep.length * sizeof(XEventClass));
 	if (list)
 	    {
 		int i;

Index: XSelect.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xi/XSelect.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/XSelect.c	5 Mar 2004 13:39:25 -0000	1.1.4.2
+++ b/XSelect.c	15 Apr 2004 10:15:04 -0000	1.1.4.3
@@ -86,7 +86,7 @@
        statement */
 
     count <<= 2;
-    Data (dpy, (char *) event_list, count);
+    Data32 (dpy, (long *) event_list, count);
 
     UnlockDisplay(dpy);
     SyncHandle();