libX11: Changes to 'master'

[Alan Coopersmith]

 modules/om/generic/omGeneric.c |   61 +-----------------------------
 modules/om/generic/omImText.c  |    4 -
 src/xcms/cmsTrig.c             |   11 -----
 src/xlibi18n/XDefaultIMIF.c    |   58 ++++++++++++----------------
 src/xlibi18n/XDefaultOMIF.c    |   83 -----------------------------------------
 5 files changed, 29 insertions(+), 188 deletions(-)

New commits:
commit 4359dfabc04af082872d2bc2d5b52e26d6d93290
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Dec 4 22:20:53 2015 -0800

    Delete #if 0 hunks of code
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit a2f9dfac286f37e54eb47d4736cc3f0150224a84
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Dec 3 23:38:07 2015 -0800

    Bug 93183: _XDefaultOpenIM memory leaks in out-of-memory error paths
    
    Rework code to store allocations directly into XIM struct instead of
    temporary local variables, so we can use _XCloseIM to unwind instead
    of duplicating it, and consistently jump to error handler on failure,
    instead of sometimes leaking and sometimes freeing.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93183
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 07a97b3944467dce085a1efd24706cc851d2caf2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Dec 3 23:19:48 2015 -0800

    Bug 93184: read_EncodingInfo invalid free
    
    Free the correct bits of memory if we run out and need to unwind
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93184
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>