libX11: Changes to 'master'

[GitLab Mirror]

 modules/im/ximcp/imRmAttr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 93fce3f4e79cbc737d6468a4f68ba3de1b83953b
Author: Yichao Yu <yyc1992 at gmail.com>
Date:   Sun Aug 2 13:43:58 2020 -0400

    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.
    
    Fix #116