###############################################################################

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

#

4614834: Xlib color functions are not MT-safe

In a multithreaded Xlib client:

    * concurrent access to XAllocNamedColor() make the client crash

    * concurrent access to XLookupColor() make the client crash

The cause of the problem is that in multithread environment some data

in XLookupColor() and XAllocNamedColor() can be accessed/modified at

same time by multi threads. Adding some lock and unlock code to make

sure only one thread can access the data at one time fixed the

problem.

diff -urp -x '*~' -x '*.orig' src/GetColor.c src/GetColor.c

--- src/GetColor.c	2008-10-07 10:18:18.000000000 -0700

+++ src/GetColor.c	2009-04-08 00:17:54.349336000 -0700

@@ -58,12 +58,14 @@ XColor *exact_def) /* RETURN */

     if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {

 	const char *tmpName = colorname;

+	LockDisplay(dpy);

 	switch (_XcmsResolveColorString(ccc, &tmpName, &cmsColor_exact,

 					XcmsRGBFormat)) {

 	case XcmsSuccess:

 	case XcmsSuccessWithCompression:

 	    _XcmsRGB_to_XColor(&cmsColor_exact, exact_def, 1);

 	    memcpy((char *)hard_def, (char *)exact_def, sizeof(XColor));

+	    UnlockDisplay(dpy);

 	    ret = XAllocColor(dpy, cmap, hard_def);

 	    exact_def->pixel = hard_def->pixel;

 	    return(ret);

@@ -76,6 +78,7 @@ XColor *exact_def) /* RETURN */

 	     */

 	    break;

 	}

+	UnlockDisplay(dpy);

     }

 #endif

diff -urp -x '*~' -x '*.orig' src/LookupCol.c src/LookupCol.c

--- src/LookupCol.c	2008-10-07 10:18:18.000000000 -0700

+++ src/LookupCol.c	2009-04-08 00:17:54.349566000 -0700

@@ -56,6 +56,7 @@ XLookupColor (

 	if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {

 	    const char *tmpName = spec;

+	    LockDisplay(dpy);

 	    switch (_XcmsResolveColorString(ccc, &tmpName, &cmsColor_exact,

 					    XcmsRGBFormat)) {

 	    case XcmsSuccess:

@@ -63,6 +64,7 @@ XLookupColor (

 		_XcmsRGB_to_XColor(&cmsColor_exact, def, 1);

 		memcpy((char *)scr, (char *)def, sizeof(XColor));

 		_XUnresolveColor(ccc, scr);

+		UnlockDisplay(dpy);

 		return(1);

 	    case XcmsFailure:

 	    case _XCMS_NEWNAME:

@@ -73,6 +75,7 @@ XLookupColor (

 		 */

 		break;

 	    }

+	    UnlockDisplay(dpy);

 	}

 #endif