aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'theqvd-slave-channel' into 3.6.xMike Gabriel2016-10-285-34/+170
|\ | | | | | | Attributes GH PR #232: https://github.com/ArcticaProject/nx-libs/pull/232
| * Add description of NX_SLAVE_CMD to man and helpVadim Troshchinskiy2016-10-282-0/+14
| |
| * Slave channel implementationVadim Troshchinskiy2016-10-283-34/+156
|/ | | | | | | | When enabled and a connection is made to the port, launches the process specified in NX_SLAVE_CMD on the other side, and connects stdin and stdout to the socket. This is used for VM/client and client/VM communication.
* Merge branch 'uli42-pr/backup_memleak' into arctica-3.6.xMihai Moldovan2016-10-281-0/+2
|\ | | | | | | Attributes GH PR #242: https://github.com/ArcticaProject/nx-libs/pull/242
| * Plug a memory leakEmilio Pozuelo Monfort2016-10-271-0/+2
|/ | | | | | | | 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>
* debian/rules: Re-enable (+pie) hardening flags again when building .deb ↵Mike Gabriel2016-10-201-1/+1
| | | | packages.
* Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.xMike Gabriel2016-10-2038-101/+95
|\ | | | | | | Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
| * sendexev.c: Fix return of unitialized variableUlrich Sibiller2016-10-201-3/+7
| | | | | | | | | | Well, kinda fix. Upstream handles that differently here, we need a thorough check! Add another FIXME comment because of this.
| * xfixes: Remove unused variable.Cyril Brulebois2016-10-201-2/+0
| | | | | | | | | | | | | | | | | | The last use of pScreen in ProcXFixesSetPictureClipRegion was removed in aa7096ca6f108e399d9916639cf20c57f9776305 so remove it entirely. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Cyril Brulebois <kibi@debian.org> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Remove useless line of code that contained a bug and triggered a gcc ↵Benjamin Herrenschmidt2016-10-201-2/+0
| | | | | | | | warning. This variable will be overriden before being used anyway. (Bugzilla #5595)
| * dix: fix cast from pointer to integerJulien Cristau2016-10-201-1/+1
| |
| * dbe: Call to DDX SwapBuffers requires address of int, not unsigned int ↵Keith Packard2016-10-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CVE-2014-8097 pt. 2] When the local types used to walk the DBE request were changed, this changed the type of the parameter passed to the DDX SwapBuffers API, but there wasn't a matching change in the API definition. At this point, with the API frozen, I just stuck a new variable in with the correct type. Because we've already bounds-checked nStuff to be smaller than UINT32_MAX / sizeof(DbeSwapInfoRec), we know it will fit in a signed int without overflow. Signed-off-by: Keith Packard <keithp@keithp.com Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * LRGB.c: Fix label defined but not usedUlrich Sibiller2016-10-201-3/+0
| | | | | | | | | | | | | | LRGB.c: In function ‘LINEAR_RGB_InitSCCData’: LRGB.c:798:1: warning: label ‘FreeBlueTblElements’ defined but not used [-Wunused-label] FreeBlueTblElements: ^
| * Fixes: warning: variable 'req' set but not,usedwalter harms2016-10-2017-18/+18
| | | | | | | | | | | | | | | | | | | | Fixes: warning: variable 'req' set but not used [-Wunused-but-set-variable] by marking req _X_UNUSED Solution was discussed on xorg-devel ML Peter Hutter, Alan Coopersmith Re: [PATCH libX11 3/5] fix: warning: pointer targets in passing argument 2 of '_XSend' differ in signedness [-Wpointer-sign] Signed-off-by: harms wharms@bfs.de
| * fix: warning: pointer targets in passing argument 2 of '_XSend' differ in ↵walter harms2016-10-201-2/+2
| | | | | | | | | | | | | | signedness [-Wpointer-sign] fix signess warning by casting Signed-off-by: walter harms <wharms@bfs.de>
| * no need to check args for Xfree()walter harms2016-10-201-41/+33
| | | | | | | | | | | | simplify code Signed-off-by: walter harms <wharms@bfs.de>
| * remove stray externwalter harms2016-10-201-1/+1
| | | | | | | | | | | | remove stray extern Signed-off-by: walter harms <wharms@bfs.de>
| * Fix warnings in XlibInt.cUlrich Sibiller2016-10-202-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: ‘noreturn’ function does return [enabled by default] } After fixing the above a new warning came up, which is also fixed now: XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: control reaches end of non-void function [-Wreturn-type] }
| * xkb.c: fix 'assignment makes integer from pointer without a cast'Ulrich Sibiller2016-10-201-1/+1
| | | | | | | | | | | | xkb.c: In function ‘_GetCountedString’: xkb.c:4405:8: warning: assignment makes integer from pointer without a cast [enabled by default] len= (CARD16 *)wire;
| * xkmread.c: use _X_UNUSED to avoid compiler warning when result is not neededUlrich Sibiller2016-10-201-4/+7
| |
| * xcmisc.c: remove HAVE_STDINTUlrich Sibiller2016-10-201-4/+0
| | | | | | | | | | This eliminates a warning since we do not have this define in our build environment.
| * security.c: fix compiler warningsUlrich Sibiller2016-10-201-2/+1
| |
| * Loop.cpp: Fix output of SetCore()Ulrich Sibiller2016-10-201-3/+3
| |
| * Window.c: Fix function assignment warningUlrich Sibiller2016-10-201-1/+1
| | | | | | | | | | | | Window.c: In function ‘nxagentFrameBufferPaintWindow’: Window.c:1968:31: warning: ISO C forbids assignment between function pointer and ‘void *’ [-Wpedantic] PaintWindowBackgroundBackup = pWin->drawable.pScreen -> PaintWindowBackground;
| * Display.c: remove unused variableUlrich Sibiller2016-10-201-2/+0
| | | | | | | | | | | | | | Display.c: In function ‘nxagentCheckForPixmapFormatsCompatibility’: Display.c:2471:8: warning: variable ‘one_match’ set but not used [-Wunused-but-set-variable] bool one_match = false; ^
| * Colormap.c: add cast to avoid warningUlrich Sibiller2016-10-201-1/+1
| | | | | | | | | | | | | | Colormap.c: In function ‘nxagentSetInstalledColormapWindows’: Colormap.c:314:27: warning: format ‘%p’ expects argument of type ‘void *’, but argument 3 has type ‘WindowPtr’ [-Wformat=] pWin, pWin -> drawable.class); ^
| * Args.c: fix string format warningUlrich Sibiller2016-10-201-2/+2
| | | | | | | | warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘long int’ [-Wformat=]
| * imLcIm.c: Fix unused variablesUlrich Sibiller2016-10-201-3/+4
| | | | | | | | | | | | | | | | | | imLcIm.c: In function ‘_XimCreateDefaultTree’: imLcIm.c:525:11: warning: unused variable ‘cachedir’ [-Wunused-variable] char *cachedir = NULL; ^ imLcIm.c:521:35: warning: variable ‘intname’ set but not used [-Wunused-but-set-variable] char *name, *tmpname = NULL, *intname;
| * Pending.c: Fix compilation warningUlrich Sibiller2016-10-201-2/+2
| | | | | | | | | | | | | | Pending.c: In function ‘XEventsQueued’: Pending.c:44:5: warning: format ‘%p’ expects argument of type ‘void *’, but argument 3 has type ‘struct Display *’ [-Wformat=] fprintf(stderr, "\nXEventsQueued: Called with a display at [%p].\n", dpy); ^
| * Fix libX11 implicit declaration warningsUlrich Sibiller2016-10-201-2/+2
|/ | | | | | | | all _X11Trans* functions lead to a warnign like this: implicit declaration of function ‘_X11TransOpenCOTSClient’ [-Wimplicit-function-declaration] Fix it by partly reverting d3ae0b2c9559e70448746240caaf5634c78d0eef (which removed too much)
* Drop nx-X11/lib/X11/libX11.elist. Not needed for anything nowadays. Probably ↵Mike Gabriel2016-10-201-41/+0
| | | | never was needed in nx-X11.
* debian/libnx-x11-6.symbols: Update symbols list.Mike Gabriel2016-10-201-4/+4
|
* XKeysymDB: ... got removed.Mike Gabriel2016-10-203-3/+0
|
* Merge branch 'uli42-pr/libX11_further_backports' into 3.6.xMike Gabriel2016-10-19229-16855/+11176
|\ | | | | | | Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222
| * Validation of server responses in XGetImage()Tobias Stoeckmann2016-10-191-9/+20
| | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * The validation of server responses avoids out of boundary accesses.Tobias Stoeckmann2016-10-193-11/+27
| | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * xcms: use size_t for pointer offsets passed to strncmpAlan Coopersmith2016-10-195-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * xcms: use unsigned indexes when looping through unsigned valuesAlan Coopersmith2016-10-196-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * xcms: use size_t for strlen/sizeof values instead of converting to int & backAlan Coopersmith2016-10-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Xlib.h: Fix macros imitating C functions.Dominik Muth2016-10-191-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * XKB: fix XkbGetKeyboardByName with Xming serverOlivier Fourdan2016-10-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * lcPubWrap: replace malloc(strlen) + strcpy with strdupAlan Coopersmith2016-10-191-2/+1
| | | | | | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * XlcDL.c: reduce code duplicationAlan Coopersmith2016-10-191-12/+10
| | | | | | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * XlcDL.c: replace strcpy+strcat sequences with snprintfAlan Coopersmith2016-10-191-6/+8
| | | | | | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * XDefaultOMIF: Remove comments referring to ancient Sun bug idsAlan Coopersmith2016-10-191-14/+1
| | | | | | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * XDefaultOMIF: additional code simplificationAlan Coopersmith2016-10-191-32/+11
| | | | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * XDefaultOMIF: replace strlen+Xmalloc+strcpy with strdupAlan Coopersmith2016-10-191-15/+8
| | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Use strdup instead of Xmalloc+strcpy in _XDefaultOpenIMAlan Coopersmith2016-10-191-2/+1
| | | | | | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Delete #if 0 hunks of codeAlan Coopersmith2016-10-194-152/+0
| | | | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Bug 93183: _XDefaultOpenIM memory leaks in out-of-memory error pathsAlan Coopersmith2016-10-191-33/+25
| | | | | | | | | | | | | | | | | | | | | | 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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 23:52:58 +0000