Rootless.c: fix wring datatype being used

Using XlibAtom here is wrong. On a 64bit system the size of this type is 8 bytes (64bit). At this stage we do not read Xlib datatypes but wire datatypes. Over the wire an Atom is always 32bit, so we need to use CARD32 here. Fixes ArcticaProject/nx-libs#894

Rootless.c: fix wring datatype being used
105cd2be · Ulrich Sibiller · bb9ac3fd · 105cd2be
Commit 105cd2be authored Jan 08, 2020 by Ulrich Sibiller
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Rootless.c nx-X11/programs/Xserver/hw/nxagent/Rootless.c +2 -2

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -1001,7 +1001,7 @@ void nxagentImportProperty(Window window,
  else if (strcmp(typeS, "ATOM") == 0)
  {
    Atom *atoms = malloc(nitems * sizeof(Atom));
-    XlibAtom *input = (XlibAtom*) buffer;
+    CARD32 *input = (CARD32*) buffer;

    if (atoms == NULL)
    {
@@ -1017,7 +1017,7 @@ void nxagentImportProperty(Window window,

    for (int i = 0; i < nitems; i++)
    {
-      atoms[i] = nxagentRemoteToLocalAtom(input[i]);
+      atoms[i] = nxagentRemoteToLocalAtom((XlibAtom)input[i]);

      if (atoms[i] == None)
      {