From 4875a15ca61358a1c95b156b2279fce092451278 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 19 Jan 2022 00:45:43 +0100 Subject: Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78 --- nx-X11/lib/src/LookupCol.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'nx-X11/lib/src/LookupCol.c') diff --git a/nx-X11/lib/src/LookupCol.c b/nx-X11/lib/src/LookupCol.c index f7f969f56..3b53bf878 100644 --- a/nx-X11/lib/src/LookupCol.c +++ b/nx-X11/lib/src/LookupCol.c @@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif +#include #include #include "Xlibint.h" #include "Xcmsint.h" @@ -40,12 +41,17 @@ XLookupColor ( XColor *def, XColor *scr) { - register int n; + register size_t n; xLookupColorReply reply; register xLookupColorReq *req; XcmsCCC ccc; XcmsColor cmsColor_exact; + if (spec == NULL) + return 0; + n = strlen (spec); + if (n >= USHRT_MAX) + return 0; #ifdef XCMS /* * Let's Attempt to use Xcms and i18n approach to Parse Color @@ -77,8 +83,6 @@ XLookupColor ( * Xcms and i18n methods failed, so lets pass it to the server * for parsing. */ - - n = strlen (spec); LockDisplay(dpy); GetReq (LookupColor, req); req->cmap = cmap; -- cgit v1.2.3