libX11: Changes to 'master'

[Alan Coopersmith]

 modules/im/ximcp/imCallbk.c    |    2 +
 modules/im/ximcp/imDefIc.c     |    4 +--
 modules/im/ximcp/imDefIm.c     |   51 ++++++++++++++++++++---------------------
 modules/im/ximcp/imDefLkup.c   |    4 ++-
 modules/im/ximcp/imLcIm.c      |    5 +++-
 modules/im/ximcp/imRmAttr.c    |    8 ++++--
 modules/om/generic/omGeneric.c |   40 ++++++++++++++++----------------
 src/FSWrap.c                   |    2 -
 src/RdBitF.c                   |    5 ++++
 src/xcms/LRGB.c                |    8 +++---
 10 files changed, 73 insertions(+), 56 deletions(-)

New commits:
commit ac1e2bff7121987fd768500a11d428d9fb9447c5
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Fri Mar 25 14:47:35 2011 +0200

    om: Fix memory leaks on get_font_name error paths.
    
    While at it, remove unneeded check for NULL before Xfree.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 7c362e275c93c92b4e68fe862e73ee36665de703
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Wed Mar 30 15:06:10 2011 +0300

    xcms: Fix memory leaks on LINEAR_RGB_InitSCCData error path.
    
    pScreenData is replaced when building per visual intensity tables. If
    malloc failed the old value of pScreenData (stored also in
    pScreenDefaultData) was being leaked. Also, property_return wasn't
    free'd in that case.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 5c810e2ac233e00f361549bafb9b59e8a9e05eff
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Wed Mar 30 15:19:28 2011 +0300

    xcms: Fix error on LINEAR_RGB_InitSCCData error path.
    
    Due to what looks like a copy & paste error, pScreenData->pBlueTbl would
    be accessed after being free'd.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit d749948f9492fd9b61c74655a08e32c595e0e3a5
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Fri Mar 25 16:06:15 2011 +0200

    om: Fix potential memory leak in init_om.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit d0749d6abdf0fd4d8b4e59b02dad8ccda3f10995
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 20:40:41 2011 +0200

    om: Fix memory leak on read_EncodingInfo error path.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 4b2e8d00f5b6969c14003ee8eb258b9f0e4dd7c3
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 19:55:33 2011 +0200

    Fix memory leaks on _XimCbDispatch error path.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 46e6c78b1a89e4774e0f7e0f4d6d0fd060c3897e
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 19:52:05 2011 +0200

    Fix memory leak on _XimCommitRecv error path.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 0ace642a2d47265f01450bfa2b2fd48eb6956a83
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 19:48:44 2011 +0200

    Fix memory leaks on _XimWriteCachedDefaultTree error paths.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit e29be94edbb58b3b8dab545377a710d1f73b61e0
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 19:42:36 2011 +0200

    Fix memory leaks on _XimGetAttributeID error paths.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit d144a50512466766f55ce61e3884925334b08f0d
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 19:36:56 2011 +0200

    Fix memory leaks on _XimProtoCreateIC error paths.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 6a452f7a98499508f753cb8a7c3f08bcbec736b9
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 16:24:29 2011 +0200

    Fix leaks in _XimEncodingNegotiation error paths.
    
    name_ptr and detail_ptr weren't free'd in some cases before returning
    False.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 396e5a452a59c1f121220ba72167b720a863b30f
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Thu Mar 24 14:17:44 2011 +0200

    FSWrap: fix potential leak in copy_string_list
    
    If list_count is 0, dst would be allocated and leaked.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 1a944260182bb552b954d69f6355c2760d4415df
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
Date:   Wed Mar 23 14:36:22 2011 +0200

    Fix memory leak with broken bitmap files in XReadBitmapFileData
    
    Bitmap file data is read looping through the lines in the input file. If
    there is extra data after the bitmap, these lines will be processed and
    if this data represents another bitmap it will replace the one read
    before causing the memory allocated for bits to leak.
    
    This changes the code to stop processing the file once a bitmap was
    read.
    
    Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>