aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* nxagent: treat all Traps as Booleans everywhereUlrich Sibiller2021-01-1512-67/+67
|
* nxagent: make nxagentVerbose a BooleanUlrich Sibiller2021-01-156-9/+9
|
* nxagent: make Desktop, Rootless and Binder options Booleans (again)Ulrich Sibiller2021-01-1511-56/+33
| | | | | They have been changed to tri-state variables (1, 0 and UNDEFINED) between nxagent 1.5.0-90 and -93, for no obvious reason.
* Options.h: mark BooleansUlrich Sibiller2021-01-151-26/+32
| | | | | Many variables are used as Booleans. By adding the Bool define to Options.h we can now make that visible.
* nxagent: make nxagentOption Shadow a BooleanUlrich Sibiller2021-01-159-25/+26
| | | | and add the missing init code.
* nxagent: treat several nxagentOptions as real BooleansUlrich Sibiller2021-01-1516-77/+77
| | | | | | | Adaptive, Composite, DeviceControl, DeviceControlUserDefined, IgnoreVisibility, InhibitXkb, Nested, Menu, MagicPixel, Persistent, Reset, ResetzKeyboardAtResume, SharedMemory, SharedPixmaps, Streaming, UseDamage, ViewOnly, Xdmcp, Xinerama
* nxagent: treat DesktopResize and nxagentResizeDesktopAtStartup as BooleansUlrich Sibiller2021-01-156-19/+19
| | | | The already where Booleans but where not using True/False values everywhere
* nxagent: make Fullscreen and AllScreens BooleansUlrich Sibiller2021-01-156-35/+29
| | | | | There's no need/sense in having a tri-state with the third state being UNDEFINED.
* Merge branch 'uli42-pr/fix_resume' into 3.6.xMike Gabriel2021-01-151-1/+22
|\ | | | | | | Attributes GH PR #977: https://github.com/ArcticaProject/nx-libs/pull/977
| * Handlers.c: ensure regular yields if suspendedUlrich Sibiller2020-12-301-1/+22
| | | | | | | | Fixes ArcticaProject/nx-libs#903
* | CVE-2020-14360: Check SetMap request length carefully.Mike Gabriel2020-12-101-0/+91
|/ | | | | | | | | | | | | | | | | | Backported from X.org: From 446ff2d3177087b8173fa779fa5b77a2a128988b Mon Sep 17 00:00:00 2001 From: Matthieu Herrb <matthieu@herrb.eu> Date: Thu, 12 Nov 2020 19:15:07 +0100 Subject: [PATCH] Check SetMap request length carefully. Avoid out of bounds memory accesses on too short request. ZDI-CAN 11572 / CVE-2020-14360 This vulnerability was discovered by: Jan-Niklas Sohn working with Trend Micro Zero Day Initiative Fixes ArcticaProject/nx-libs#972.
* Events.c: fix leftover DEBUG and TEST definitionsUlrich Sibiller2020-12-031-4/+1
| | | | causing DEBUG output in regular builds.
* NXdixfonts.c: Regression fix for db45683a. Fix typo in libXfont1 function ↵Mike Gabriel2020-11-041-1/+1
| | | | call (FreeFontName -> FreeFontNames). Fixes FTBFS on Ubuntu 14.04 and 16.04.
* release 3.5.99.253.5.99.25Mike Gabriel2020-11-049-10/+371
|
* Merge branch 'uli42-pr/various5' into 3.6.xMike Gabriel2020-11-0413-250/+190
|\ | | | | | | Attributes GH PR #963: https://github.com/ArcticaProject/nx-libs/pull/963
| * NXdixfonts.c: Hard-code the enablement of NXAGENT_DANGEROUS_XFONT_LOOP_EXIT.Mike Gabriel2020-11-041-0/+7
| |
| * NXdixfonts.c: Rename BREAK_XFONT_LOOP to NXAGENT_DANGEROUS_XFONT_LOOP_EXIT ↵Mike Gabriel2020-11-041-4/+4
| | | | | | | | (better macro name).
| * Clipboard.c: fix bug in special optimization for nested settingsUlrich Sibiller2020-11-041-2/+3
| | | | | | | | Fixes ArcticaProject/nx-libs#941
| * compext/Png.c: fix shadowingUlrich Sibiller2020-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Png.c: In function ‘PngWriteData’: Png.c:603:38: warning: declaration of ‘png_ptr’ shadows a global declaration [-Wshadow] 603 | static void PngWriteData(png_structp png_ptr, png_bytep data, png_size_t length) | ~~~~~~~~~~~~^~~~~~~ Png.c:77:13: note: shadowed declaration is here 77 | png_structp png_ptr; | ^~~~~~~ Png.c: In function ‘PngFlushData’: Png.c:610:38: warning: declaration of ‘png_ptr’ shadows a global declaration [-Wshadow] 610 | static void PngFlushData(png_structp png_ptr) | ~~~~~~~~~~~~^~~~~~~ Png.c:77:13: note: shadowed declaration is here 77 | png_structp png_ptr; | ^~~~~~~
| * Screen.c: fix indentation in nxagentMaximizeToFullScreenUlrich Sibiller2020-11-031-37/+37
| |
| * Atoms.c: fix FIXME commentUlrich Sibiller2020-11-031-1/+1
| |
| * Atoms.c: improve debug outputUlrich Sibiller2020-11-031-1/+1
| |
| * Events.c: scope improvementUlrich Sibiller2020-11-031-2/+2
| |
| * Log.h: fix some shadow warningsUlrich Sibiller2020-11-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | "warning: declaration of '<something>' shadows a member of 'this' This shows up in gcc 4.8.5 and has been fixed in gcc 5.0, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57709 Change the variable names anyway to be on the safe side. Fixes ArcticaProject/nx-libs#958
| * Channel.h: rename variable to prevent shadowingUlrich Sibiller2020-11-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In file included from Proxy.h:39:0, from ServerProxy.h:32, from ServerProxy.cpp:36: Channel.h: In member function 'int Channel::handleEncodeIdentity(EncodeBuffer&, ChannelCache*, MessageStore*, const unsigned char*, unsigned int, int)': Channel.h:369:3: warning: declaration of 'bigEndian' shadows a member of 'this' [-Wshadow] { ^ Channel.h: In member function 'int Channel::handleDecodeIdentity(DecodeBuffer&, ChannelCache*, MessageStore*, unsigned char*&, unsigned int&, int, WriteBuffer*)': Channel.h:378:3: warning: declaration of 'bigEndian' shadows a member of 'this' [-Wshadow] { ^ RHEL7's g++ 4.8.5 reports this while Debian's g++ 10.2.0-15 does not. This is described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57709 and fixed in gcc 5.0. Rename the variables anyway to be on the safe side. Fixes ArcticaProject/nx-libs#956
| * nx-libs.spec: Set python shebang to python3 on fedora and rhel8Ulrich Sibiller2020-11-031-0/+5
| | | | | | | | | | | | | | | | | | | | *** ERROR: ambiguous python shebang in /usr/bin/nxdialog: #!/usr/bin/env python. Change it to python3 (or python2) explicitly. Fedora offers a pythfix.py but I could not test with that so I simply used sed... Fixes ArcticaProject/nx-libs#955
| * Xext/panoramiX.c: rename shadowing variablesUlrich Sibiller2020-11-031-7/+7
| |
| * Clipboard.c: add missing ifdefsUlrich Sibiller2020-11-031-0/+6
| |
| * Compext.c: scope improvementsUlrich Sibiller2020-11-031-14/+6
| |
| * GCs.h: fix typoUlrich Sibiller2020-11-031-1/+1
| |
| * Atoms.c: drop double includeUlrich Sibiller2020-11-031-1/+0
| |
| * Compext.c: use SAFE_free macroUlrich Sibiller2020-11-034-169/+106
| |
| * Clipboard.c: fix missing )Ulrich Sibiller2020-11-031-1/+1
| |
* | Merge branch 'sunweaver-pr/default-to-NXAGENT_DANGEROUS_XFONT_LOOP_EXIT' ↵Mike Gabriel2020-11-041-4/+11
|\ \ | |/ |/| | | | | | | | | into 3.6.x Attributes GH PR #961: https://github.com/ArcticaProject/nx-libs/pull/961 Approved by Ulrich Sibiller <uli42@gmx.de>, Tue, 03 Nov 2020 08:14:04 -0800
| * NXdixfonts.c: Hard-code the enablement of NXAGENT_DANGEROUS_XFONT_LOOP_EXIT.Mike Gabriel2020-11-031-0/+7
| |
| * NXdixfonts.c: Rename BREAK_XFONT_LOOP to NXAGENT_DANGEROUS_XFONT_LOOP_EXIT ↵Mike Gabriel2020-11-031-4/+4
|/ | | | (better macro name).
* Merge branch 'uli42-pr/font_memleak' into 3.6.xMike Gabriel2020-11-031-6/+56
|\ | | | | | | Attributes GH PR #949: https://github.com/ArcticaProject/nx-libs/pull/949
| * NXdixfonts.c: fix memory leakUlrich Sibiller2020-11-031-6/+56
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==15332== 2,500 (96 direct, 2,404 indirect) bytes in 6 blocks are definitely lost in loss record 324 of 342 ==15332== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==15332== by 0x5748B9E: FontFileStartListFonts (in /usr/lib/x86_64-linux-gnu/libXfont.so.1.4.1) ==15332== by 0x5748C4A: FontFileStartListFontsAndAliases (in /usr/lib/x86_64-linux-gnu/libXfont.so.1.4.1) ==15332== by 0x42859A: nxdoListFontsAndAliases (NXdixfonts.c:1163) ==15332== by 0x42C0E0: nxOpenFont (NXdixfonts.c:1541) ==15332== by 0x43392E: ProcOpenFont (NXdispatch.c:902) ==15332== by 0x434585: Dispatch (NXdispatch.c:482) ==15332== by 0x40EF77: main (main.c:355) FontFileStartListFonts[AndAliases]() allocates some private data. This data is used by subsequent calls of FontFileListNextFontOrAlias() in a loop. (Only) the last call to that function will free() the private data and return with BadFontName. FontFileListNextFontOrAlias() is the only libXfont function that free()s the private data. In nxagent the loop is exited as soon as a font exists both locally and remote. Therefore the private data would never be free()d. Solution: do not break the loop but store the first matching result and let the loop run to the end, ignoring all following results. Disadvantage: this can mean hundreds of extra iterations for nothing. I have done no investigation of the time penalty this might cause. Unfortunately this is the only clean way I have found so far. An unclean solution has also been implemented. It can be activated by defining BREAK_XFONT_LOOP. In that case the private data is handled in nxagent by taking assumptions about its structure (taken from the libXfont source). That will break if libXfont changes its internal handling of the private. Therefore it is discouraged. An third alternative would be to drop using libXfont from the system. Instead fork libXfont to the nx-libs tree, add some patches link to that library statically. Fixes ArcticaProject/nx-libs#586
* Merge branch 'uli42-pr/xlib_memleak' into 3.6.xMike Gabriel2020-11-031-12/+28
|\ | | | | | | Attributes GH PR #952: https://github.com/ArcticaProject/nx-libs/pull/952
| * yConnDis.c: fix memory leakUlrich Sibiller2020-11-031-12/+28
|/ | | | | | | | | | | | | | | | | | Direct leak of 3 byte(s) in 1 object(s) allocated from: #0 0xb79e85d4 in __interceptor_malloc (/lib/i386-linux-gnu/libasan.so.5+0xeb5d4) #1 0xb770b635 in copystring /home/uli/work/nx/nx-libs/nx-X11/lib/src/ConnDis.c:96 #2 0xb770ba56 in _X11TransConnectDisplay /home/uli/work/nx/nx-libs/nx-X11/lib/src/ConnDis.c:229 #3 0xb776b4fd in XOpenDisplay /home/uli/work/nx/nx-libs/nx-X11/lib/src/OpenDis.c:215 #4 0x63e2fd in nxagentInternalOpenDisplay /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/hw/nxagent/Display.c:608 #5 0x63fa03 in nxagentOpenDisplay /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/hw/nxagent/Display.c:1140 #6 0x694b5a in InitOutput /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/hw/nxagent/Init.c:305 #7 0x5f7b11 in main /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/dix/main.c:278 #8 0xb6f04b40 in __libc_start_main ../csu/libc-start.c:308 I have not investigated the exact location where an XFree() was missing but added multiple Xfree() calls whereever appropriate. Fixes ArcticaProject/nx-libs#951
* Merge pull request #960 from uli42/pr/fix_specfileUlrich Sibiller2020-11-021-1/+1
|\ | | | | fix spec file
| * fix spec fileUlrich Sibiller2020-11-021-1/+1
|/ | | | | | doc file path for nxdialog was wrong Fixes ArcticaProject/nx-libs#959
* Merge branch 'uli42-pr/window_resize_bug' into 3.6.xMike Gabriel2020-10-1810-267/+416
|\ | | | | | | Attributes GH PR #940: https://github.com/ArcticaProject/nx-libs/pull/940
| * Events.c: More cosmeticsUlrich Sibiller2020-10-171-7/+9
| |
| * Window.c: some more TEST and DEBUG outputUlrich Sibiller2020-10-171-0/+9
| |
| * Screen.c: some more (cosmetic) changesUlrich Sibiller2020-10-171-61/+49
| |
| * Screen.c: scope improvementsUlrich Sibiller2020-10-171-25/+13
| |
| * Screen.c: move attributes/valuemask to inner scopesUlrich Sibiller2020-10-171-11/+9
| |
| * Screen.c: drop unneccessary mask variableUlrich Sibiller2020-10-171-9/+3
| |
| * Screen.c: remove another pointless code blockUlrich Sibiller2020-10-171-10/+0
| | | | | | | | | | Setting nxagentDefaultWindow[pScreen->myNum] is pointless because it is overwritten in the next code block...
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 23:28:38 +0000