libX11: Changes to 'master'

[Alan Coopersmith]

 src/xlibi18n/ICWrap.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit c827edcd1c4a7f920aa25208083b5b58d60d2b44
Author: Ross Burton <ross.burton at intel.com>
Date:   Mon May 18 14:49:01 2015 +0100

    Add missing NULL checks to ICWrap
    
    ICWrap.c dereferences the xim parameter passed in from client code without a
    NULL check.  I have seen mplayer trigger this resulting in a segfault.  In this
    case mplayer had called XOpenIM and NULL was returned which was later passed
    into XCreateIC.
    
    Patch originally by Drew Moseley <drew_moseley at mentor.com>.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>