summaryrefslogtreecommitdiff
path: root/src/CopyCmap.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix XTS regression in XCopyColormapAndFreeAdam Jackson2020-01-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XCopyColormapAndFree/5 threw an assertion: 520|4 5 00014017 1 2|Assertion XCopyColormapAndFree-5.(A) 520|4 5 00014017 1 3|When a colourmap argument does not name a valid colourmap, 520|4 5 00014017 1 4|then a BadColor error occurs. 520|4 5 00014017 1 5|METH: Create a bad colourmap by creating and freeing a colourmap. 520|4 5 00014017 1 6|METH: Call test function using bad colourmap as the colourmap argument. 520|4 5 00014017 1 7|METH: Verify that a BadColor error occurs. 520|4 5 00014017 1 8|unexpected signal 6 (SIGABRT) received 220|4 5 2 15:05:53|UNRESOLVED 410|4 5 1 15:05:53|IC End 510|4|system 0: Abandoning testset: caught unexpected signal 11 (SIGSEGV) More specifically: lt-XCopyColormapAndFree: xcb_io.c:533: _XAllocID: Assertion `ret != inval_id' failed. This bug was introduced (by following my advice, d'oh) in: commit 99a2cf1aa0b58391078d5d3edf0a7dab18c7745d Author: Tapani Pälli <tapani.palli@intel.com> Date: Mon May 13 08:29:49 2019 +0300 Protect colormap add/removal with display lock In that patch we moved the call to _XcmsCopyCmapRecAndFree inside the display lock. The problem is said routine has side effects, including trying to implicitly create a colormap in some cases. Since we don't run the XID handler until SyncHandle() we would see inconsistent internal xlib state, triggering the above assert. Fix this by dropping and re-taking the display lock before calling into XCMS. Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
* Protect colormap add/removal with display lockTapani Pälli2019-05-141-3/+3
| | | | | | | | | | | | This fixes a bug where concurrent threads call XCreateColormap and XFreeColormap corrupting a linked list where colormap structures are stored. Fixes: https://gitlab.freedesktop.org/xorg/lib/libx11/issues/94 v2: handle XCopyColormapAndFree also (Adam Jackson) Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
* Purge CVS/RCS id tagsAlan Coopersmith2010-01-141-2/+0
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
* Strip whitespace from end of lines in source filesAlan Coopersmith2008-06-171-1/+1
|
* Switched function definitions from K&R to ANSI style.Magnus Kessler2007-05-011-3/+3
|
* Minor changes to help modular Xlib build i18n modulesKeith Packard2005-07-111-1/+8
|
* - For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in ↵XORG-6_8_99_7Søren Sandmann Pedersen2005-05-131-0/+3
| | | | | | | | | | | <X11/...> - For Xcomposite and Xdamage, don't link the build system out of the xc tree - Link the public X11 headers into their own directory - Add links to XKeysymDB and XErrorDB - Add links to all the Xlib man pages - Add links to the lcUniConv subdirectory - Conditionally include config.h in Xlib source
* Merging XORG-CURRENT into trunkEgbert Eich2004-04-231-0/+7
|
* R6.6 is the Xorg base-lineXORG-MAINKaleb Keithley2003-11-141-0/+49