Commit graph

1318 commits

Author SHA1 Message Date
Petr Písař
23d9623c66 Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8
The cs_CZ.UTF-8/XLC_LOCALE is an empty file leading to unsupported cs_CZ.UTF-8
locale and reporting this error:

Warning: locale not supported by Xlib, locale set to C

Therefore this patch reverts to the en_US.UTF-8 definition file that was used
before. This patch also deduplicates the cs_CZ.UTF-8 entry.

<https://bugs.freedesktop.org/show_bug.cgi?id=98219>

This reverts commit 33840a5465

Signed-off-by: Julien Cristau <jcristau@debian.org>
2017-01-27 23:55:41 +01:00
Mihail Konev
71b0929ebc autogen: add default patch prefix
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26 13:52:49 +10:00
Emil Velikov
2979011bc1 autogen.sh: use quoted string variables
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26 11:59:25 +10:00
Peter Hutterer
4a0082a1b6 autogen.sh: use exec instead of waiting for configure to finish
Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-01-26 11:59:25 +10:00
Julien Cristau
c74b070f27 Fix wrong Xfree in XListFonts failure path
'ch' gets moved inside the allocated buffer as we're looping through
fonts, so keep a reference to the start of the buffer so we can pass
that to Xfree in the failure case.

Fixes: commit 20a3f99eba "Plug a memory leak"

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-09 09:28:52 +10:00
Alan Coopersmith
663f47075f specs/libX11: Update Portability Considerations for the 21st century
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-03 08:50:52 +10:00
Alan Coopersmith
28f4b989b5 specs/libX11: Fix broken synopsis for Data/Data16/Data32
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-01 20:39:53 -08:00
Alan Coopersmith
382561951e specs/libX11: Add missing parameter types for XGetWindowProperty()
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-01 20:31:54 -08:00
Alan Coopersmith
2beaecdb66 specs/libX11: Make paramdef spacing more consistent
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-01 20:20:32 -08:00
Alan Coopersmith
4c436c6c14 specs/libX11: Fix paramdef entries listing multiple parameters
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-01 20:13:29 -08:00
Alan Coopersmith
1728b1a8a4 specs/libX11: More synopsis fixes
Mostly transforming macro definitions and functions taking void arguments
from undecorated <para> tags to use <funcsynopsis> tags to get decorations.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-01 19:46:31 -08:00
Lucien Gentis
f0dc83db7e Typos in "Xlib - C Language X Interface" document - Chapter 02
This patch fixes typos and lack of tags in "Xlib - C Language X Interface" document - Chapter 02.

Signed-off-by: Lucien Gentis <lucien.gentis@waika9.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-01 17:11:02 -08:00
Emilio Pozuelo Monfort
20a3f99eba Plug a memory leak
This was introduced in 8ea762f.

Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-10-26 15:46:26 +10:00
Matthieu Herrb
8f349feac2 libX11 1.6.4
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
2016-10-04 21:01:39 +02:00
Tobias Stoeckmann
8ea762f94f Validation of server responses in XGetImage()
Check if enough bytes were received for specified image type and
geometry. Otherwise GetPixel and other functions could trigger an
out of boundary read later on.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
2016-09-25 21:26:50 +02:00
Tobias Stoeckmann
8c29f1607a The validation of server responses avoids out of boundary accesses.
v2: FontNames.c  return a NULL list whenever a single
length field from the server is incohent.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
2016-09-25 21:22:57 +02:00
walter harms
78851f6a03 XFree will accept NULL as argument
since Xfree is a define for free():
  Xlibint.h:#define Xfree(ptr) free((ptr))

Xfree will accept NULL and do nothing.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2016-08-26 11:04:10 +02:00
Matthew D. Fuller
83adf3d1e3 Fixup param specification for XChangeProperty()
Signed-off-by: Matthew D. Fuller <fullermd@over-yonder.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-06-06 09:44:18 +10:00
Mats Blakstad
3129c757f9 New compose keys for local languages in Togo
Signed-off-by: James Cloos <cloos@jhcloos.com>
2016-03-09 12:47:05 -05:00
Daniel Albers
e1011b9e2f Add Compose sequence for U+1F4A9.
Signed-off-by: Daniel Albers <daniel@lbe.rs>
2016-03-09 09:47:05 -05:00
Alan Coopersmith
6d7bb040c9 xcms: use size_t for pointer offsets passed to strncmp
instead of converting to int and back

Fixes clang warnings of the form:
HVC.c:190:43: warning: implicit conversion changes signedness: 'int' to
      'unsigned long' [-Wsign-conversion]
          if (strncmp(spec, _XcmsTekHVC_prefix, n) != 0) {
              ~~~~~~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2016-02-06 15:39:36 -08:00
Alan Coopersmith
a9266804ee xcms: use unsigned indexes when looping through unsigned values
Clears many gcc warnings of the form:

uvY.c: In function ‘XcmsCIEuvYToCIEXYZ’:
uvY.c:263:19: warning: comparison between signed and unsigned integer
  expressions [-Wsign-compare]
     for (i = 0; i < nColors; i++, pColor++) {
                   ^

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2016-02-06 13:40:26 -08:00
Alan Coopersmith
0ee0d383b4 xcms: use size_t for strlen/sizeof values instead of converting to int & back
Fixes gcc warnings of the form:

IdOfPr.c: In function ‘XcmsFormatOfPrefix’:
IdOfPr.c:69:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if ((len = strlen(prefix)) >= sizeof(string_buf)) {
                                ^
IdOfPr.c:83:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (len >= sizeof(string_buf)) Xfree(string_lowered);
           ^
IdOfPr.c:97:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (len >= sizeof(string_buf)) Xfree(string_lowered);
           ^
IdOfPr.c:104:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (len >= sizeof(string_buf)) Xfree(string_lowered);
             ^

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2016-02-06 13:39:38 -08:00
Dominik Muth
4de6ed3e7b Xlib.h: Fix macros imitating C functions.
The basic rule "put parantheses around macro parameters" should be
observed where possible. Otherwise code like

    ConnectionNumber(foo = bar);

fails to compile. (It obviously passes if ConnectionNumber is a C
function.) There are several other macros amended for the same reason.

This bug appeared while building http://ioccc.org/1993/cmills.c, so
historically it was not present.

Signed-off-by: Dominik Muth <muth@nxdomain.no-ip.biz>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2016-02-03 22:11:38 -08:00
Alan Coopersmith
3706b0f2b1 Don't need to link libX11-xcb against libX11
libX11-xcb only accesses data structures defined in X11 headers,
it doesn't call any functions or reference any global variables
in libX11 itself.  (Seems to have been left from previous XCL
implementation.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2016-02-03 21:58:24 -08:00
Alan Coopersmith
eddf1bbd18 Stop checking for preferred order of local transports
Removes --with-local-transport-order=... flag to configure.

Code which used this ordered list was removed in commit 15e5eaf628
which outsourced X11 connection handling & authentication to libxcb.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
2016-02-03 21:58:18 -08:00
Alan Coopersmith
1a66c1e964 Stop checking XTRANS_SECURE_RPC_FLAGS since we no longer use them
Removes --enable-secure-rpc & --disable-secure-rpc flags to configure

Code that used SECURE_RPC definitions was removed in commit 15e5eaf628
which outsourced X11 connection handling & authentication to libxcb.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
2016-02-03 21:57:47 -08:00
Olivier Fourdan
7eb724dc24 XKB: fix XkbGetKeyboardByName with Xming server
XkbGetKeyboardByName relies on flags to read the data from the server.

If the X server sends us the wrong flags or if a subreply is smaller
than it should be, XkbGetKeyboardByName will not read all the available
data and leave data in the buffer, which will cause the next _XReply()
to fail with:

[xcb] Extra reply data still left in queue
[xcb] This is most likely caused by a broken X extension library
[xcb] Aborting, sorry about that.
xcb_io.c:576: _XReply: Assertion `!xcb_xlib_extra_reply_data_left' failed.
Aborted

Check if there is some extra data left at the end of
XkbGetKeyboardByName() and discard that data if any is found.

Many thanks to Peter Hutterer <peter.hutterer@who-t.net> for finding the
root cause of the issue and Adam Jackson <ajax@redhat.com> for helping
with the analysis!

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-22 07:40:39 +10:00
Alan Coopersmith
43ba0a68d3 lcPubWrap: replace malloc(strlen) + strcpy with strdup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-01-05 17:24:26 -08:00
Alan Coopersmith
6fc95cb12b XlcDL.c: reduce code duplication
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-01-05 17:24:20 -08:00
Alan Coopersmith
f7ecc0856b XlcDL.c: replace strcpy+strcat sequences with snprintf
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-01-05 17:24:12 -08:00
Alan Coopersmith
522989b343 XDefaultOMIF: Remove comments referring to ancient Sun bug ids
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-01-05 17:24:03 -08:00
Alan Coopersmith
b738a104ae XDefaultOMIF: additional code simplification
Don't need to test for a case that we already returned for, don't need
to store a count that will only ever be 1 if we didn't return, don't
need to increment pointers to allow storing more than one item when we
can only ever possibly do one.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-01-05 17:23:46 -08:00
Alan Coopersmith
31011cf100 XDefaultOMIF: replace strlen+Xmalloc+strcpy with strdup
Code seems to have been originally written to handle appending multiple
strings, but only ever operates on a single string.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-01-05 17:23:36 -08:00
Alan Coopersmith
c27c46d5e2 Use strdup instead of Xmalloc+strcpy in _XDefaultOpenIM
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-01-05 17:23:25 -08:00
Alan Coopersmith
4359dfabc0 Delete #if 0 hunks of code
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-12-18 23:50:26 -08:00
Alan Coopersmith
a2f9dfac28 Bug 93183: _XDefaultOpenIM memory leaks in out-of-memory error paths
Rework code to store allocations directly into XIM struct instead of
temporary local variables, so we can use _XCloseIM to unwind instead
of duplicating it, and consistently jump to error handler on failure,
instead of sometimes leaking and sometimes freeing.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93183
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-12-18 23:49:54 -08:00
Alan Coopersmith
07a97b3944 Bug 93184: read_EncodingInfo invalid free
Free the correct bits of memory if we run out and need to unwind

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93184
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-12-03 23:21:31 -08:00
Alan Coopersmith
11118e9eb3 Remove unused definition of XCONN_CHECK_FREQ
The only use of XCONN_CHECK_FREQ was removed in commit 15e5eaf628
when we dropped the old Xlib connection handling in favor of xcb's.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
2015-12-03 23:02:18 -08:00
James Cloos
5f0da8311a
Fix another missing update in cf4d598938
Reported in:

   https://bugs.freedesktop.org/show_bug.cgi?id=81875#c7

Signed-off-by: James Cloos <cloos@jhcloos.com>
2015-12-03 18:24:44 -05:00
James Cloos
33840a5465
Fix missing update in cf4d598938
Reported in:

   https://bugs.freedesktop.org/show_bug.cgi?id=81875#c7

Signed-off-by: James Cloos <cloos@jhcloos.com>
2015-12-03 18:15:51 -05:00
Alan Coopersmith
dbcb847a08 Get rid of some extraneous ; at the end of C source lines
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
2015-10-19 13:52:20 -04:00
Gunnar Hjalmarsson
121a1bad33 Add compose file for pt_PT similar to pt_BR
This is a forward of the Ubuntu bug https://launchpad.net/bugs/518056

One of the conclusions from the discussion on that bug report, which
basically is about typing the ccedilla character easily on a non-
Portuguese keyboard, is that X11 should include a compose file for
pt_PT.UTF-8 similar to the file for pt_BR.UTF-8.

FDO bug: https://bugs.freedesktop.org/show_bug.cgi?id=90300

Signed-off-by: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2015-09-25 09:29:25 -04:00
Julien Cristau
3f41d8a7f8 Mark _XNextRequest as hidden
It's only used inside XNextRequest(), so doesn't need to be exported.

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-09-21 12:48:03 -04:00
Christian Linhart
a72d2d06c0 fix for Xlib 32-bit request number issues
Make use of the new 64-bit sequence number API in XCB 1.11.1 to avoid
the 32-bit sequence number wrap in libX11.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71338
Signed-off-by: Christian Linhart <chris@demorecorder.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2015-09-21 12:46:55 -04:00
Thomas Klausner
58af066a76 Ignore test-driver (used by newer autoconf).
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-07-19 23:01:05 +02:00
Thomas Klausner
80b9a346b9 Do not return() after exit().
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-07-19 23:01:05 +02:00
Ross Burton
c827edcd1c Add missing NULL checks to ICWrap
ICWrap.c dereferences the xim parameter passed in from client code without a
NULL check.  I have seen mplayer trigger this resulting in a segfault.  In this
case mplayer had called XOpenIM and NULL was returned which was later passed
into XCreateIC.

Patch originally by Drew Moseley <drew_moseley@mentor.com>.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-07-19 08:49:39 -07:00
Alan Coopersmith
26e0d2de29 Replace Xmalloc+memset pairs with Xcalloc calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-06-04 20:51:17 -07:00
Bhavi Dhingra
f0286b2770 omGeneric.c: Correct the parameter usage of sizeof
Incorrect parameter usage with sizeof. Earlier passed argument FontData
will be 4 bytes always as its a pointer hence the change is needed and
FontDataRec should be used for memset.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-06-04 19:08:31 -07:00