Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/trunk]: xsrc/external/mit merge libXau 1.0.9 and libfontenc 1.1.4.



details:   https://anonhg.NetBSD.org/xsrc/rev/e93a6d8942f3
branches:  trunk
changeset: 10111:e93a6d8942f3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 03 07:08:47 2019 +0000

description:
merge libXau 1.0.9 and libfontenc 1.1.4.

diffstat:

 external/mit/libXau/dist/AuFileName.c |  13 ++++++++-----
 external/mit/libfontenc/dist/README   |  25 -------------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diffs (67 lines):

diff -r a18d8792004b -r e93a6d8942f3 external/mit/libXau/dist/AuFileName.c
--- a/external/mit/libXau/dist/AuFileName.c     Sun Mar 03 07:03:36 2019 +0000
+++ b/external/mit/libXau/dist/AuFileName.c     Sun Mar 03 07:08:47 2019 +0000
@@ -29,6 +29,7 @@
 #endif
 #include <X11/Xauth.h>
 #include <X11/Xos.h>
+#include <assert.h>
 #include <stdlib.h>
 
 static char *buf = NULL;
@@ -71,12 +72,14 @@
        return NULL;
     }
     size = strlen (name) + strlen(&slashDotXauthority[1]) + 2;
-    if (size > bsize) {
-       if (buf)
-           free (buf);
+    if ((size > bsize) || (buf == NULL)) {
+       free (buf);
+        assert(size > 0);
        buf = malloc (size);
-       if (!buf)
+       if (!buf) {
+           bsize = 0;
            return NULL;
+       }
 
 #ifndef __NetBSD__
         if (!atexit_registered) {
@@ -88,6 +91,6 @@
        bsize = size;
     }
     snprintf (buf, bsize, "%s%s", name,
-              slashDotXauthority + (name[1] == '\0' ? 1 : 0));
+              slashDotXauthority + (name[0] == '/' && name[1] == '\0' ? 1 : 0));
     return buf;
 }
diff -r a18d8792004b -r e93a6d8942f3 external/mit/libfontenc/dist/README
--- a/external/mit/libfontenc/dist/README       Sun Mar 03 07:03:36 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-libfontenc - font encoding library
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/lib/libfontenc
-
-        http://cgit.freedesktop.org/xorg/lib/libfontenc
-
-For patch submission instructions, see:
-
-       http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-



Home | Main Index | Thread Index | Old Index