aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Re-enable XC-MISC extensionUlrich Sibiller2018-01-082-2/+3
| | | | | | Got dropped by accident in 9bc6ff269aa8bf4c41696ebf4a686c93729ba151 Fixes ArcticaProject/nx-libs#589
* Merge branch 'uli42-pr/fix_strings' into 3.6.xMihai Moldovan2018-01-0714-275/+182
|\ | | | | | | Attributes GH PR #567: https://github.com/ArcticaProject/nx-libs/pull/567
| * Display.c: drop helper variable in loopUlrich Sibiller2018-01-071-4/+2
| |
| * Error.c: replace malloc+strcpy by strdupUlrich Sibiller2018-01-071-5/+3
| |
| * Events.c: add FIXMEUlrich Sibiller2018-01-071-0/+1
| |
| * Keyboard.c: rework string allocation/buildingUlrich Sibiller2018-01-071-14/+10
| |
| * Keystroke.c: replace calloc + 2 * strcpy by asprintfUlrich Sibiller2018-01-071-3/+1
| |
| * Font.c: replace malloc + strcpy by strdup + fix memleakUlrich Sibiller2018-01-071-2/+3
| |
| * Font.c: free possibly allocated memUlrich Sibiller2018-01-071-0/+5
| | | | | | | | even if we issue a FatalError afterwards
| * Font.c: replace memcpy by sprintf preventing possible buffer overflowsUlrich Sibiller2018-01-071-9/+3
| | | | | | | | | | | | I am not sure about the maximum font name length in X but just in case use snprintf instead of memcpy to be sure nothing dangerous can happen here.
| * Args.c: simplify nxagentGetDialogName()Ulrich Sibiller2018-01-071-11/+4
| |
| * Args.c, Error.[ch]: introduce own length macro for nxagentClientsLogNameUlrich Sibiller2018-01-073-5/+6
| |
| * Args.c: use strdup instead of mallocUlrich Sibiller2018-01-071-35/+7
| |
| * Error.c: update nxagentPrintErrorUlrich Sibiller2018-01-071-6/+8
| | | | | | | | | | | | | | This is a partial copy from XlibInt.c's _XPrintDefaultError, which had some minor changes since being copied. Update to reflect these changes. Also comment some more lines as their result was unused an cluttered the output.
| * Error.c: replace strcpy/strcat by snprintfUlrich Sibiller2018-01-072-21/+13
| |
| * Error.c: use standard file descriptor macrosUlrich Sibiller2018-01-071-3/+3
| |
| * Error.c: remove trailing whitespaceUlrich Sibiller2018-01-071-5/+5
| | | | | | | | and insert one single space
| * Error.c: remove empty ifdefUlrich Sibiller2018-01-071-4/+0
| |
| * Font.c: pass down sizeUlrich Sibiller2018-01-071-6/+5
| |
| * Display.c: pass down buffer size to nxagentLookForIconFileUlrich Sibiller2018-01-071-24/+22
| | | | | | | | Also comment the code and convert error messages to warnings.
| * Replace hardcoded string lengths by macrosUlrich Sibiller2018-01-076-69/+43
| |
| * Font.c: make nxagentGetFontServerPath more readableUlrich Sibiller2018-01-071-4/+5
| |
| * Screen.c: string handling improvementsUlrich Sibiller2018-01-071-16/+10
| |
| * Font.c: shorten string handlingUlrich Sibiller2018-01-071-18/+7
| |
| * Keyboard.c: replace malloc + strcpy by asprintfUlrich Sibiller2018-01-071-6/+4
| |
| * Keyboard.c: improve user messages for keyboard file handlingUlrich Sibiller2018-01-071-1/+1
| |
| * Keyboard.c: fix memory leakUlrich Sibiller2018-01-071-1/+3
| |
| * Dialog.c: fix possible buffer overflowsUlrich Sibiller2018-01-071-0/+13
| | | | | | | | Fix write past the end of singlePath if PATH contains dirs longer than PATH_MAX.
| * Dialog.c,Display.c,NXdixfonts.c: replace strncpy() by snprintf where appropriateUlrich Sibiller2018-01-075-17/+11
| |
| * Dialog.c,Display.c,Font.c,NXdixfonts.c: don't use hardcoded string buffer ↵Ulrich Sibiller2018-01-074-20/+18
|/ | | | lengths
* Merge branch 'Ionic-bugfix/rpath' into 3.6.xMihai Moldovan2018-01-0512-23/+132
|\ | | | | | | | | | | Attributes GH PR #614: https://github.com/ArcticaProject/nx-libs/pull/614 Fixes: ArcticaProject/nx-libs#610
| * nxproxy/src/Makefile.am: build library using RUNPATH instead of RPATH.Mihai Moldovan2018-01-031-0/+1
| | | | | | | | | | Will only be useful at build time, since installation strips any RPATH/RUNPATH again.
| * nxproxy/configure.ac: enable libtool support.Mihai Moldovan2018-01-031-0/+3
| | | | | | | | | | | | | | | | Using libtool, the nxproxy binary will be replaced by a shell script wrapper that correctly pulls in required libraries (like libXcomp), thus making it possible to start the binary directly in the build directory. This wrapper is dropped during installation time.
| * nxproxy/configure.ac: drop --enable-cxx11.Mihai Moldovan2018-01-031-6/+0
| | | | | | | | | | | | | | | | This is a C program, so enabling or disabling C++11 support will not do anything useful. At most it'll lead to errors when using libtool, which is the next change to come...
| * Makefile: only try to copy/dereference libNX* files when installing data.Mihai Moldovan2017-12-301-1/+1
| |
| * nx-X11: reintroduce creation of libX11 compat symlinks.Mihai Moldovan2017-12-302-0/+25
| | | | | | | | | | We need this to be able to execute the resulting nxagent binary from within the build directory.
| * Makefile: install relinked program binary instead of the "temporary" one.Mihai Moldovan2017-12-301-1/+1
| |
| * nx-X11: build programs with a temporary RPATH/RUNPATH value and a relinked ↵Mihai Moldovan2017-12-307-10/+78
| | | | | | | | | | | | | | | | | | version with the system location. While the install target explicitly installs the relinked system-location version of a program, we do not actually use this. Currently, we copy nxagent directly out of the build root.
| * nxcompshad/src/Makefile.am: enable new ELF dtags to force RUNPATH creation ↵Mihai Moldovan2017-12-301-0/+1
| | | | | | | | for libXcompshad.
| * nx-X11/config/cf/{gnu,lnx}Lib.rules: enable new ELF dtags to force RUNPATH ↵Mihai Moldovan2017-12-302-6/+6
| | | | | | | | creation for nxagent.
| * nxcompshad/src/Makefile.am: implement libX11 RPATH/RUNPATH override.Mihai Moldovan2017-12-301-1/+5
| | | | | | | | | | | | | | Same method as used in the previous commit, but easier done thanks to autotools and libtool. Fixes: ArcticaProject/nx-libs#610
| * nxagent: implement RPATH/RUNPATH override for libX11.Mihai Moldovan2017-12-304-2/+15
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in ArcticaProject/nx-libs#610, we need a way to load libNX_X11 as a fake version of libX11 into nxagent's address space. For doing so, we have to link against libX11 at build-time and specify a(n) RPATH/RUNPATH to our libX11 -> libNX_X11 compat symlinks. This commit is essentially doing a cross between options 3 and 4 discussed in the provided GH issue. We link libX11 early (before specifying -Lcompat_symlinks_dir), so that the linker finds the "real" libX11 version with the libX11 SONAME. This leads to our binary depending upon both libX11 and libNX_X11 SONAMEs. We already always added RPATH/RUNPATH, but these values are not passed down to dependent libraries. What happens at run-time is that the loader searches for a libX11 SONAME, takes RPATH/RUNPATH into account and loads our libNX_X11 library instead via the compat symlinks. This satisfies the libX11 SONAME and dependent libraries will *not* load the system libX11 version again. Debian's dpkg-shlibdeps isn't quite happy about this mismatching SONAME situation, so instruct to look the other way while we're minding our business. Fixes: ArcticaProject/nx-libs#610
* Merge branch 'uli42-pr/fix_abstract' into 3.6.xMihai Moldovan2017-12-306-109/+175
|\ | | | | | | | | | | | | Attributes GH PR #615: https://github.com/ArcticaProject/nx-libs/pull/615 Fixes: ArcticaProject/nx-libs#612 Fixes: ArcticaProject/nx-libs#572
| * EncodeBuffer.cpp: add another VALGRIND guardUlrich Sibiller2017-12-291-1/+9
| | | | | | | | Fixes ArcticaProject/nx-libs#572
| * nxcomp: drop strncpy in favour of snprintfUlrich Sibiller2017-12-293-44/+33
| | | | | | | | with very few exceptions which require careful thinking ;-)
| * Loop.cpp: fix memleak happening with unknown tcp hostUlrich Sibiller2017-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==28424== 6 bytes in 1 blocks are definitely lost in loss record 1 of 7 ==28424== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==28424== by 0x541D4D9: strndup (strndup.c:43) ==28424== by 0x4E8AD4B: ChannelEndPoint::getTCPHostAndPort(char**, long*) const (ChannelEndPoint.cpp:311) ==28424== by 0x4EBE9CC: ConnectToRemote(ChannelEndPoint&) (Loop.cpp:6656) ==28424== by 0x4EB0A4C: SetupProxyConnection() (Loop.cpp:3205) ==28424== by 0x4EDC81A: handleNegotiationInLoop(int&, fd_set&, fd_set&, timeval&) (Loop.cpp:14308) ==28424== by 0x4EAE40F: NXTransPrepare (Loop.cpp:2576) ==28424== by 0x4EAA801: NXTransContinue (Loop.cpp:1610) ==28424== by 0x4EB50C9: WaitCleanup() (Loop.cpp:4436) ==28424== by 0x4EA9507: NXTransProxy (Loop.cpp:1235) ==28424== by 0x400B2A: main (Main.c:111)
| * ChannelEndPoint.cpp: fix possible memleak in getUnixPath()Ulrich Sibiller2017-12-293-4/+7
| |
| * ChannelEndPoint.cpp: remove unneccessary codeUlrich Sibiller2017-12-291-2/+0
| | | | | | | | SAFE_FREE has set defaultUnixPath_ to NULL already
| * ChannelEndPoint.cpp: fix another memleakUlrich Sibiller2017-12-293-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==7689== 50 bytes in 5 blocks are definitely lost in loss record 1 of 2 ==7689== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==7689== by 0x54074D9: strndup (strndup.c:43) ==7689== by 0x4E7D803: ChannelEndPoint::getTCPHostAndPort(char**, long*) const (ChannelEndPoint.cpp:309) ==7689== by 0x4EC9D93: ConnectToRemote(ChannelEndPoint&) [clone .constprop.144] (Loop.cpp:6660) ==7689== by 0x4ECB94E: SetupProxyConnection() (Loop.cpp:3204) ==7689== by 0x4ECE824: handleNegotiationInLoop(int&, fd_set&, fd_set&, timeval&) [clone .isra.129] (Loop.cpp:14312) ==7689== by 0x4ED0F8A: NXTransPrepare (Loop.cpp:2575) ==7689== by 0x4ED1C35: NXTransContinue (Loop.cpp:1609) ==7689== by 0x4ED1D7B: WaitCleanup() (Loop.cpp:4440) ==7689== by 0x4ED2343: NXTransProxy (Loop.cpp:1234) ==7689== by 0x400B2A: main (Main.c:111)
| * EncodeBuffer.cpp: add VALGRIND guardUlrich Sibiller2017-12-291-0/+7
| | | | | | | | | | | | | | Same as in WriteBuffer.cpp Valgrind will complain about uninitialized data, but we are only writing to the memory here.