libX11: Changes to 'master'

[GitLab Mirror]

 modules/im/ximcp/imInsClbk.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a3c0b5dbd6b12ae64bc78b11795647a7f6df0c7a
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 17 13:15:18 2020 -0800

    Copy locale modifiers when creating XimInstCallback [v2]
    
    Locale modifiers may be freed whenever XSetLocaleModifiers gets
    called, even if the locale hasn't changed. This means that we cannot
    save a pointer to those modifiers in the XimInstCallback record and
    must, instead, make a copy of them instead.
    
    This fixes a problem uncovered when running wish under libasan as
    follows (on current Debian unstable):
    
    	$ LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.6 wish
    
    Reported-by: Vittorio Zecca <zeccav at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    
    v2:
    	Remove incorrect 'else' token found by @alanc