Sun Aug 30 04:53:28 2020 UTC ()
merge libX11 1.6.12.


(mrg)
diff -r1.5 -r1.6 xsrc/external/mit/libX11/dist/man/XCreateGC.man
diff -r1.2 -r1.3 xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
cvs diff -r1.5 -r1.6 xsrc/external/mit/libX11/dist/man/XCreateGC.man (expand / switch to unified diff)

--- xsrc/external/mit/libX11/dist/man/XCreateGC.man 2020/02/23 09:05:17 1.5
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man 2020/08/30 04:53:28 1.6
@@ -168,27 +168,27 @@ If the valuemask contains a valid set of @@ -168,27 +168,27 @@ If the valuemask contains a valid set of
168.BR GCLineStyle , 168.BR GCLineStyle ,
169.BR GCCapStyle , 169.BR GCCapStyle ,
170.BR GCJoinStyle , 170.BR GCJoinStyle ,
171.BR GCFillStyle , 171.BR GCFillStyle ,
172.BR GCFillRule , 172.BR GCFillRule ,
173.BR GCTile , 173.BR GCTile ,
174.BR GCStipple , 174.BR GCStipple ,
175.BR GCTileStipXOrigin , 175.BR GCTileStipXOrigin ,
176.BR GCTileStipYOrigin , 176.BR GCTileStipYOrigin ,
177.BR GCFont , 177.BR GCFont ,
178.BR GCSubwindowMode , 178.BR GCSubwindowMode ,
179.BR GCGraphicsExposures , 179.BR GCGraphicsExposures ,
180.BR GCClipXOrigin , 180.BR GCClipXOrigin ,
181.BR GCCLipYOrigin , 181.BR GCClipYOrigin ,
182.BR GCDashOffset , 182.BR GCDashOffset ,
183or 183or
184.BR GCArcMode ) 184.BR GCArcMode )
185and no error occurs, 185and no error occurs,
186.B XGetGCValues 186.B XGetGCValues
187sets the requested components in values_return and returns a nonzero status. 187sets the requested components in values_return and returns a nonzero status.
188Otherwise, it returns a zero status. 188Otherwise, it returns a zero status.
189Note that the clip-mask and dash-list (represented by the 189Note that the clip-mask and dash-list (represented by the
190.B GCClipMask 190.B GCClipMask
191and 191and
192.B GCDashList 192.B GCDashList
193bits, respectively, in the valuemask) 193bits, respectively, in the valuemask)
194cannot be requested. 194cannot be requested.
cvs diff -r1.2 -r1.3 xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c (expand / switch to unified diff)

--- xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c 2020/08/04 15:47:27 1.2
+++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c 2020/08/30 04:53:28 1.3
@@ -1397,27 +1397,27 @@ _XimCountNumberOfAttr( @@ -1397,27 +1397,27 @@ _XimCountNumberOfAttr(
1397 CARD16 *attr, 1397 CARD16 *attr,
1398 unsigned int *names_len) 1398 unsigned int *names_len)
1399{ 1399{
1400 unsigned int n; 1400 unsigned int n;
1401 CARD16 len; 1401 CARD16 len;
1402 CARD16 min_len = sizeof(CARD16) /* sizeof attribute ID */ 1402 CARD16 min_len = sizeof(CARD16) /* sizeof attribute ID */
1403 + sizeof(CARD16) /* sizeof type of value */ 1403 + sizeof(CARD16) /* sizeof type of value */
1404 + sizeof(INT16); /* sizeof length of attribute */ 1404 + sizeof(INT16); /* sizeof length of attribute */
1405 1405
1406 n = 0; 1406 n = 0;
1407 *names_len = 0; 1407 *names_len = 0;
1408 while (total > min_len) { 1408 while (total > min_len) {
1409 len = attr[2]; 1409 len = attr[2];
1410 if (len >= (total - min_len)) { 1410 if (len > (total - min_len)) {
1411 return 0; 1411 return 0;
1412 } 1412 }
1413 *names_len += (len + 1); 1413 *names_len += (len + 1);
1414 len += (min_len + XIM_PAD(len + 2)); 1414 len += (min_len + XIM_PAD(len + 2));
1415 total -= len; 1415 total -= len;
1416 attr = (CARD16 *)((char *)attr + len); 1416 attr = (CARD16 *)((char *)attr + len);
1417 n++; 1417 n++;
1418 } 1418 }
1419 return n; 1419 return n;
1420} 1420}
1421 1421
1422Bool 1422Bool
1423_XimGetAttributeID( 1423_XimGetAttributeID(