Make nxagent aware of its NX'ish version string (and number). #3

sunweaver · 2015-02-16T14:22:10Z

Until now, nxagent uses a hard-coded version string internally that is set to "3.5.0" in nx-X11/programs/Xserver/hw/nxagent/Init.c.

This change picks the version number from /VERSION, populates nx-X11/config/cf/nxversion.def with it and propagates it through to the nxagent's Imakefile.

Ionic · 2015-02-16T18:54:38Z

Makefile

+NX_VERSION_MINOR=$(shell cat VERSION | cut -d"." -f2)
+NX_VERSION_MICRO=$(shell cat VERSION | cut -d"." -f3)
+NX_VERSION_PATCH=$(shell cat VERSION | cut -d"." -f4)
+


Maybe it's better to use a "real" shell script here which fetches the version number part and, if it is unset, defaults to "0", to always have the parts well-defined?

The script can be as easy as:

#!/bin/sh COMPONENT="$1" VERSION_FILE="VERSION" # More than one line is not supported. VER="$(head -n "1" "${VERSION_FILE}" | cut -d"." -f"${COMPONENT}")" [ "x${VER}" = "x" ] && VER="0" printf "${VER}"

mikedep333 · 2015-02-16T23:04:14Z

Is there a reason why we are differing from upstream? Like because our build system is so different? With VcXsrv, both I and marha use the convention that X.org uses:
http://cgit.freedesktop.org/xorg/xserver/commit/?id=3a06faf3fcdb7451125a46181f9152e8e59e9770&utm_source=anzwix
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/common/xorgVersion.h?id=xorg-server-1.17.1

In particular, note that they use:
XORG_VERSION_MAJOR
XORG_VERSION_MINOR
XORG_VERSION_PATCH
XORG_VERSION_SNAP
(Although I agree that major, minor, micro, and patch is more intuitive.)

Ionic · 2015-02-17T00:51:22Z

NX always used their own version numbering scheme and has incremented the MAJOR version often, while X never has. I feel the MAJOR/MINOR/MICRO/PATCH definition is a better fix for nx-libs.

mikedep333 · 2015-02-17T01:32:13Z

Understood, I will continue reviewing.

mikedep333 · 2015-02-17T02:47:33Z

I need to learn make syntax better. Based on my review, this looks OK to me.

Ionic · 2015-02-17T02:50:24Z

Well, this is additionally complicated, because this is not exactly make syntax. That's imake syntax, which is different and even requires a pre-processor...

sunweaver · 2015-02-17T04:09:43Z

Hi Mihai, hi Michael,

I just pushed three more commits to the feature/nxagent-version PR branch.

If there are no more objections within the next 9h (1300 UTC), I will merge.

Mike

sunweaver · 2015-02-17T04:10:36Z

... I will rebase the new commits with commit 0e341f5 before merging...

sunweaver · 2015-02-17T04:12:50Z

About the versioning in NX. In X2Go we received a patch that allows for having four digit versions. There the original author also used M.m.µ.p as naming scheme. I like it back then and adopted it here.

This feature copies the way how X.Org version string and number are propagated at build time. First use case: if people start nxagent, it reports its version number on stderr. This is about being human-friendly. Second use case: None, so far. But it will now be easy to use the NXAGENT_VERSION_STRING in later feature add-ons.

Make nxagent aware of its NX'ish version string (and number).

If compiled with -fsanitize=address this showed up when running startlxde: ==11551==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60d000018fbc at pc 0x7f270a9ed57b bp 0x7fff30ef3050 sp 0x7fff30ef2800 READ of size 204 at 0x60d000018fbc thread T0 #0 0x7f270a9ed57a (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a) #1 0x559dafcd5c93 in FindGlyphRef ../../render/glyph.c:179 #2 0x559dafcd705d in AddGlyph /work/nx-libs/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c:71 #3 0x559dafccc0ff in ProcRenderAddGlyphs ../../mi/../render/render.c:1186 ArcticaProject#4 0x559dafcbd5a5 in ProcRenderDispatch /work/nx-libs/nx-X11/programs/Xserver/hw/nxagent/NXrender.c:1689 ArcticaProject#5 0x559dafcbc4ea in Dispatch /work/nx-libs/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c:476 ArcticaProject#6 0x559dafc4e9b0 in main /work/nx-libs/nx-X11/programs/Xserver/dix/main.c:353 ArcticaProject#7 0x7f2708e1d09a in __libc_start_main ../csu/libc-start.c:308 ArcticaProject#8 0x559dafc4f5d9 in _start (/work/nx-libs/nx-X11/programs/Xserver/nxagent+0x6e5d9) 0x60d000018fbc is located 0 bytes to the right of 140-byte region [0x60d000018f30,0x60d000018fbc) allocated by thread T0 here: #0 0x7f270aa1e330 in __interceptor_malloc (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xe9330) #1 0x559dafcd646c in AllocateGlyph ../../render/glyph.c:348 This happens when two glyphs are compared via memcmp and the smaller one happens to be identical to the beginning of the bigger one. Newer render implementations use a sha1 hash instead of memcmp so this patch will (hopefully) be obsolete once render gets updated.

In compext Atom has the size of XlibAtom. Therefore calling functions of Compext.c requires to use/pass XlibAtom. Same for Window/XlibWindow. ==15438==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fffffffcdc0 at pc 0x5555556a81b5 bp 0x7fffffffcd10 sp 0x7fffffffcd08 WRITE of size 8 at 0x7fffffffcdc0 thread T0 #0 0x5555556a81b4 in NXGetCollectedProperty nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c:4124 #1 0x5555557d0488 in nxagentCollectPropertyEvent nx-X11/programs/Xserver/hw/nxagent/Clipboard.c:1202 #2 0x555555723340 in nxagentHandleCollectPropertyEvent nx-X11/programs/Xserver/hw/nxagent/Events.c:3923 #3 0x55555571d4db in nxagentHandleProxyEvent nx-X11/programs/Xserver/hw/nxagent/Events.c:3007 ArcticaProject#4 0x55555571bb92 in nxagentHandleClientMessageEvent nx-X11/programs/Xserver/hw/nxagent/Events.c:2595 ArcticaProject#5 0x555555717dfc in nxagentDispatchEvents nx-X11/programs/Xserver/hw/nxagent/Events.c:1827 ArcticaProject#6 0x555555750813 in nxagentBlockHandler nx-X11/programs/Xserver/hw/nxagent/Handlers.c:437 ArcticaProject#7 0x5555556c1b5d in BlockHandler nx-X11/programs/Xserver/dix/dixutils.c:403 ArcticaProject#8 0x5555556d47ff in WaitForSomething nx-X11/programs/Xserver/os/WaitFor.c:232 ArcticaProject#9 0x555555665b22 in Dispatch nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c:365 ArcticaProject#10 0x5555555ed760 in main nx-X11/programs/Xserver/dix/main.c:350 ArcticaProject#11 0x7ffff604909a in __libc_start_main ../csu/libc-start.c:308 ArcticaProject#12 0x5555555edc09 in _start (nx-X11/programs/Xserver/nxagent+0x99c09) Address 0x7fffffffcdc0 is located in stack of thread T0 at offset 32 in frame #0 0x5555557d0324 in nxagentCollectPropertyEvent nx-X11/programs/Xserver/hw/nxagent/Clipboard.c:1190 This frame has 5 object(s): [32, 36) 'atomReturnType' <== Memory access at offset 32 partially overflows this variable [96, 100) 'resultFormat' [160, 168) 'ulReturnItems' [224, 232) 'ulReturnBytesLeft' [288, 296) 'pszReturnData' HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork (longjmp and C++ exceptions *are* supported) SUMMARY: AddressSanitizer: stack-buffer-overflow nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c:4124 in NXGetCollectedProperty ...

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 ArcticaProject#4 0x63e2fd in nxagentInternalOpenDisplay /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/hw/nxagent/Display.c:608 ArcticaProject#5 0x63fa03 in nxagentOpenDisplay /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/hw/nxagent/Display.c:1140 ArcticaProject#6 0x694b5a in InitOutput /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/hw/nxagent/Init.c:305 ArcticaProject#7 0x5f7b11 in main /home/uli/work/nx/nx-libs/nx-X11/programs/Xserver/dix/main.c:278 ArcticaProject#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#951

nx-X11/programs/Xserver/hw/nxagent/: Drop unused VERSION file.

eb49d40

Ionic reviewed Feb 16, 2015
View reviewed changes

sunweaver force-pushed the feature/nxagent-version-v2 branch from 1d4e263 to 203d971 Compare February 17, 2015 08:27

sunweaver added a commit that referenced this pull request Feb 17, 2015

Merge pull request #3 from sunweaver/feature/nxagent-version-v2

c910bf7

Make nxagent aware of its NX'ish version string (and number).

sunweaver merged commit c910bf7 into ArcticaProject:3.6.x Feb 17, 2015

sunweaver deleted the feature/nxagent-version-v2 branch April 21, 2015 18:35

sunweaver added the enhancement label May 16, 2015

sunweaver added this to the 3.6.0.x milestone May 16, 2015

This was referenced Feb 23, 2016

Gedit, gnome-terminal and others crash in rootless mode #82

Closed

[abrt] nxagent: GetULONG(): nxagent killed by SIGSEGV #85

Closed

[abrt] nxagent: nxagentDispatchEvents(): nxagent killed by SIGSEGV #92

Closed

uli42 mentioned this pull request Apr 26, 2016

nxagent segfaults on session resume #118

Closed

sunweaver mentioned this pull request Mar 7, 2017

kwin crashes with 3.5.99.4 #386

Closed

realsimix mentioned this pull request Sep 11, 2017

nxagent segfaults (not always) if built with NXAGENT_RENDER_CLEANUP #512

Closed

sunweaver mentioned this pull request Nov 22, 2017

switch to recent devPrivates ABI (as used in X.org's Xserver) #560

Open

pgotch mentioned this pull request Mar 12, 2018

Coredump of nxagent when connecting #679

Closed

uli42 mentioned this pull request Mar 14, 2018

nxagent crashes when moving the session window into another screen #677

Closed

JohnCaiJun mentioned this pull request Nov 28, 2018

running nxagent in remote , how can i render 3d app on my local pc by local gpu? #739

Open

uli42 mentioned this pull request May 15, 2019

Division by zero in xkbUtils.c #808

Open

uli42 mentioned this pull request Aug 10, 2019

nxagent: Pass down if window manager has been detected #830

Open

uli42 mentioned this pull request Oct 9, 2019

malloc in signal handler causes deadlock #854

Open

realsimix mentioned this pull request Jan 7, 2020

Segfault in nxagent after updating snapshot from 20191116 -> 20200106 #893

Closed

uli42 mentioned this pull request Oct 7, 2020

nxagent: fix stack smashing #942

Merged

uli42 mentioned this pull request Oct 18, 2020

Memory leak in ConnDis.c #951

Closed

opoplawski mentioned this pull request Nov 17, 2020

[abrt] nxagent: CreateScratchGC(): nxagent killed by SIGSEGV #967

Open

uli42 mentioned this pull request Jan 16, 2021

nxagent segfults with -geometry fullscreen #987

Closed

uli42 mentioned this pull request Mar 2, 2021

Unresponsive session #970

Open

uli42 mentioned this pull request Mar 16, 2021

x2goagent 3.5.99.26 crashes on connect #1009

Closed

uli42 mentioned this pull request Nov 30, 2022

Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78 #1037

Closed

uli42 mentioned this pull request Oct 16, 2023

Segfault in libXcompshad #1069

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make nxagent aware of its NX'ish version string (and number). #3

Make nxagent aware of its NX'ish version string (and number). #3

sunweaver commented Feb 16, 2015

Ionic Feb 16, 2015

Ionic Feb 17, 2015

mikedep333 commented Feb 16, 2015

Ionic commented Feb 17, 2015

mikedep333 commented Feb 17, 2015

mikedep333 commented Feb 17, 2015

Ionic commented Feb 17, 2015

sunweaver commented Feb 17, 2015

sunweaver commented Feb 17, 2015

sunweaver commented Feb 17, 2015

Make nxagent aware of its NX'ish version string (and number). #3

Make nxagent aware of its NX'ish version string (and number). #3

Conversation

sunweaver commented Feb 16, 2015

Ionic Feb 16, 2015

Choose a reason for hiding this comment

Ionic Feb 17, 2015

Choose a reason for hiding this comment

mikedep333 commented Feb 16, 2015

Ionic commented Feb 17, 2015

mikedep333 commented Feb 17, 2015

mikedep333 commented Feb 17, 2015

Ionic commented Feb 17, 2015

sunweaver commented Feb 17, 2015

sunweaver commented Feb 17, 2015

sunweaver commented Feb 17, 2015