Module Name: xsrc Committed By: martin Date: Wed May 19 17:19:20 UTC 2021
Modified Files: xsrc/external/mit/libX11/dist/src [netbsd-8]: Font.c FontInfo.c FontNames.c GetColor.c LoadFont.c LookupCol.c ParseCol.c QuExt.c SetFPath.c SetHints.c StNColor.c StName.c xsrc/external/mit/libX11/dist/src/xlibi18n [netbsd-8]: imKStoUCS.c Log Message: Apply patch, requested by mrg in ticket #1679: xsrc/external/mit/libX11/dist/src/Font.c (apply patch) xsrc/external/mit/libX11/dist/src/FontInfo.c (apply patch) xsrc/external/mit/libX11/dist/src/FontNames.c (apply patch) xsrc/external/mit/libX11/dist/src/GetColor.c (apply patch) xsrc/external/mit/libX11/dist/src/LoadFont.c (apply patch) xsrc/external/mit/libX11/dist/src/LookupCol.c (apply patch) xsrc/external/mit/libX11/dist/src/ParseCol.c (apply patch) xsrc/external/mit/libX11/dist/src/QuExt.c (apply patch) xsrc/external/mit/libX11/dist/src/SetFPath.c (apply patch) xsrc/external/mit/libX11/dist/src/SetHints.c (apply patch) xsrc/external/mit/libX11/dist/src/StNColor.c (apply patch) xsrc/external/mit/libX11/dist/src/StName.c (apply patch) xsrc/external/mit/libX11/dist/src/xlibi18n/imKStoUCS.c (apply patch) Apply upstream fixes for CVE-2021-31535 (and one other bug). Reject string longer than USHRT_MAX before sending them on the wire. Fix out-of-bound access in KeySymToUcs4(). To generate a diff of this commit: cvs rdiff -u -r1.5.2.1 -r1.5.2.2 xsrc/external/mit/libX11/dist/src/Font.c cvs rdiff -u -r1.1.1.7.2.1 -r1.1.1.7.2.2 \ xsrc/external/mit/libX11/dist/src/FontInfo.c cvs rdiff -u -r1.6.2.2 -r1.6.2.3 \ xsrc/external/mit/libX11/dist/src/FontNames.c cvs rdiff -u -r1.1.1.3.16.1 -r1.1.1.3.16.2 \ xsrc/external/mit/libX11/dist/src/GetColor.c \ xsrc/external/mit/libX11/dist/src/LoadFont.c \ xsrc/external/mit/libX11/dist/src/LookupCol.c \ xsrc/external/mit/libX11/dist/src/ParseCol.c cvs rdiff -u -r1.1.1.4.16.1 -r1.1.1.4.16.2 \ xsrc/external/mit/libX11/dist/src/QuExt.c cvs rdiff -u -r1.1.1.4.8.1 -r1.1.1.4.8.2 \ xsrc/external/mit/libX11/dist/src/SetFPath.c cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.2 \ xsrc/external/mit/libX11/dist/src/SetHints.c cvs rdiff -u -r1.1.1.2.16.1 -r1.1.1.2.16.2 \ xsrc/external/mit/libX11/dist/src/StNColor.c cvs rdiff -u -r1.1.1.4.10.1 -r1.1.1.4.10.2 \ xsrc/external/mit/libX11/dist/src/StName.c cvs rdiff -u -r1.1.1.4.10.1 -r1.1.1.4.10.2 \ xsrc/external/mit/libX11/dist/src/xlibi18n/imKStoUCS.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.