Would any Apple user be kind enough to check this trivial X server patch?

[Adam Richter]

Hi.

The attached patch fixes three places in hw/xquartz/darwin.c that
relied on side effects in assert parameters.  That is, they would fail
if assert() were replaced with a macro that did not evaluate its
parameters.

I would appreciate it if anyone with an appropriate Apple system would
try this trivial patch and let me know the results.  Critiques of this
patch are also welcome, of course.  If I do not get a response to this
in the next day or two, I expect I will submit the patch on the gitlab
server, but having someone actually build and run it first would be
much better.

Thanks in advance for any responses.

Adam

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 5c7e96e87..1026bcf02 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -517,13 +517,15 @@ InitInput(int argc, char **argv)
         .rules   = "base", .model         = "empty", .layout = "empty",
         .variant = NULL,   .options       = NULL
     };
+    int result;
 
     /* We need to really have rules... or something... */
     XkbSetRulesDflts(&rmlvo);
 
-    assert(Success == AllocDevicePair(serverClient, "xquartz virtual",
-                                      &darwinPointer, &darwinKeyboard,
-                                      DarwinMouseProc, DarwinKeybdProc, FALSE));
+    result = AllocDevicePair(serverClient, "xquartz virtual",
+                             &darwinPointer, &darwinKeyboard,
+                             DarwinMouseProc, DarwinKeybdProc, FALSE);
+    assert(result == Success);
 
     /* here's the snippet from the current gdk sources:
        if (!strcmp (tmp_name, "pointer"))
@@ -677,8 +679,12 @@ OsVendorInit(void)
     if (serverGeneration == 1) {
         char *lf;
         char *home = getenv("HOME");
+        int nbytes;
+
         assert(home);
-        assert(0 < asprintf(&lf, "%s/Library/Logs/X11", home));
+
+        nbytes = asprintf(&lf, "%s/Library/Logs/X11", home);
+        assert(nbytes > 0);
 
         /* Ignore errors.  If EEXIST, we don't care.  If anything else,
          * LogInit will handle it for us.
@@ -686,9 +692,9 @@ OsVendorInit(void)
         (void)mkdir(lf, S_IRWXU | S_IRWXG | S_IRWXO);
         free(lf);
 
-        assert(0 <
-               asprintf(&lf, "%s/Library/Logs/X11/%s.log", home,
-                        bundle_id_prefix));
+        nbytes = asprintf(&lf, "%s/Library/Logs/X11/%s.log", home,
+                          bundle_id_prefix);
+        assert(nbytes > 0);
         LogInit(lf, ".old");
         free(lf);
 

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel