History log of /xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
Revision Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
# 6e467124 17-Nov-2024 mrg <mrg@NetBSD.org>

merge libX11 1.8.10

# 16add077 30-Aug-2020 mrg <mrg@NetBSD.org>

merge libX11 1.6.12.

# 72837c87 04-Aug-2020 maya <maya@NetBSD.org>

From 93fce3f4e79cbc737d6468a4f68ba3de1b83953b Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Sun, 2 Aug 2020 13:43:58 -0400
Subject: [PATCH] Fix size calculation in `_XimAttributeToValue`.

The check here guards the read below.
For `XimType_XIMStyles`, these are `num` of `CARD32` and for `XimType_XIMHotKeyTriggers`
these are `num` of `XIMTRIGGERKEY` ref[1] which is defined as 3 x `CARD32`.
(There are data after the `XIMTRIGGERKEY` according to the spec but they are not read by this
function and doesn't need to be checked.)

The old code here used the native datatype size instead of the wire protocol size causing
the check to always fail.

Also fix the size calculation for the header (size). It is 2 x CARD16 for both types
despite the unused `CARD16` for `XimType_XIMStyles`.

[1] https://www.x.org/releases/X11R7.6/doc/libX11/specs/XIM/xim.html#Input_Method_Styles

This fixes a regression caused by 388b303c62aa35a245f1704211a023440ad2c488 in 1.6.10.

# 9c019ec5 31-Jul-2020 maya <maya@NetBSD.org>

initial import of libX11-1.6.10

# 0f8248bf 19-Jul-2015 mrg <mrg@NetBSD.org>

initial import of libX11-1.6.3

# 818534a1 16-Mar-2014 mrg <mrg@NetBSD.org>

initial import of libX11-1.6.2

# eb411b4b 30-May-2013 mrg <mrg@NetBSD.org>

initial import of libX11-1.5.99.902

# 6cc2b21f 03-Aug-2011 mrg <mrg@NetBSD.org>

initial import of libX11 1.4.4. important changes include:
- fix many memory leaks
- fix use-after-free errors
- better error messages for XCB protocol issues

we could use the new setup POSTLOCALELIBDIR to make i18n 32-bit
compat aware, if we ever decide to create compat 32-bit X11 libs.

# 57f47464 23-Jul-2011 mrg <mrg@NetBSD.org>

initial import of libX11-1.4.3. important changes include:
uncommon memory leak fixes
uninitialised memory fixes

# b4ee4795 22-May-2010 mrg <mrg@NetBSD.org>

initial import of libX11-1.3.3

# 61b2299d 10-Mar-2009 mrg <mrg@NetBSD.org>

initial import of libX11-1.2

# 1ab64890 30-Jul-2008 mrg <mrg@NetBSD.org>

initial import of libX11-1.1.4