libXi: Changes to 'master'

Peter Hutterer whot at kemper.freedesktop.org
Wed May 4 16:11:23 PDT 2011


 man/XIChangeHierarchy.txt |    3 ++-
 src/XExtInt.c             |    5 +----
 src/XIHierarchy.c         |    3 +++
 src/XISelEv.c             |    2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 4cc2b17a3d069b296837edbd6e81af5bbf9821b4
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 3 14:51:12 2011 +1000

    Remove a few unused assignments.
    
    Found by static analyzer.
    
    Reported-by: Jeremy Huddleston <jeremyhu at apple.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

commit cc6feecae23b321952921cf927bc965386844c8c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 3 14:34:22 2011 +1000

    XIChangeHierarchy: Return Success early if no actual changes are requested.
    
    Do the same for negative num_changes.
    
    Found by static analyzer.
    
    Reported-by: Jeremy Huddleston <jeremyhu at apple.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

commit af65475b1f6b7209750220a74aaad9968d54aaf7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 3 13:21:02 2011 +1000

    Allocate enough memory for raw events + extra data.
    
    Necessary space was calculated, but not actually used to allocate memory. As
    a result, valuator data would overwrite the allocated memory.
    
    ==4166== Invalid write of size 1
    ==4166==    at 0x4C29F04: memcpy (mc_replace_strmem.c:497)
    ==4166==    by 0x8F39180: ??? (in /usr/lib/libXi.so.6.1.0)
    ==4166==    by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
    ==4166==    by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
    ==4166==    by 0x49C3E3: process_key (x11_be.c:1065)
    ==4166==    by 0x49EA5C: event_key_release (x11_be.c:2201)
    ==4166==    by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
    ==4166==    by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
    ==4166==    by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
    ==4166==    by 0x87549C9: start_thread (pthread_create.c:300)
    ==4166==    by 0x8A516FC: clone (clone.S:112)
    ==4166==  Address 0x168afe80 is 0 bytes after a block of size 96 alloc'd
    ==4166==    at 0x4C284A8: malloc (vg_replace_malloc.c:236)
    ==4166==    by 0x8F390BD: ??? (in /usr/lib/libXi.so.6.1.0)
    ==4166==    by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0)
    ==4166==    by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0)
    ==4166==    by 0x49C3E3: process_key (x11_be.c:1065)
    ==4166==    by 0x49EA5C: event_key_release (x11_be.c:2201)
    ==4166==    by 0x49DD6E: x11_be_process_events (x11_be.c:1892)
    ==4166==    by 0x4A38F4: x11_be_main_loop (x11_be.c:4353)
    ==4166==    by 0x4A39E1: x11_be_thread_main (x11_be.c:4385)
    ==4166==    by 0x87549C9: start_thread (pthread_create.c:300)
    
    Reported-by: Roger Cruz <roger.cruz at virtualcomputer.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>

commit 18177afd4fb3934d0a9083c599fb96701eec2ad9
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Fri Apr 1 22:49:09 2011 +0200

    Fix XISelectEvents on 64 bits, strict alignement architectures.
    
    Use Data() to send the struct xXIEventMask on the wire instead of
    Data32() which expects a pointer to a 64bits value on LP64
    architectures.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>



More information about the xorg-commit mailing list