libxi: Changes to 'debian-wheezy'

[Emilio Pozuelo Monfort <pochu@moszumanska.debian.org>]

 debian/changelog    |    7 +++++++
 src/XIQueryDevice.c |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8c1a684e7cbe28723b012098b8b29b04c6df54bd
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date:   Thu Dec 29 11:36:45 2016 +0100

    Upload to wheezy-security

diff --git a/debian/changelog b/debian/changelog
index 98b168e..9cc1a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libxi (2:1.6.1-1+deb7u3) UNRELEASED; urgency=medium
+libxi (2:1.6.1-1+deb7u3) wheezy-security; urgency=medium
 
   * Cherry-pick commit 3018bd9:
     - Fix Xfree on uninitialized pointers. Closes: #849026.
 
- -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 29 Dec 2016 11:36:24 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 29 Dec 2016 11:36:42 +0100
 
 libxi (2:1.6.1-1+deb7u2) wheezy-security; urgency=medium
 

commit 348aad45c9200826733af0f793cd22fd93913597
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date:   Thu Dec 29 11:36:35 2016 +0100

    Document cherry-pick

diff --git a/debian/changelog b/debian/changelog
index e53c614..98b168e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.6.1-1+deb7u3) UNRELEASED; urgency=medium
+
+  * Cherry-pick commit 3018bd9:
+    - Fix Xfree on uninitialized pointers. Closes: #849026.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 29 Dec 2016 11:36:24 +0100
+
 libxi (2:1.6.1-1+deb7u2) wheezy-security; urgency=medium
 
   * Cherry-pick upstream commit 19a9cd6:

commit f764bbc76108cca8c1a1076d8c069115188657eb
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date:   Tue Dec 27 17:24:10 2016 +0100

    Fix possible free of uninitialized pointer
    
    If the _XReply() call fails, we'll try to free an uninitialized
    pointer.
    
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849026
    
    Reported-by: Thomas Walker <thwalker3@gmail.com>
    Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org>
    Reviewed-by: Julien Cristau <jcristau@debian.org>
    Tested-by: Thomas Walker <thwalker3@gmail.com>
    Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c
index 3fc412e..ff2c438 100644
--- a/src/XIQueryDevice.c
+++ b/src/XIQueryDevice.c
@@ -46,7 +46,7 @@ XIQueryDevice(Display *dpy, int deviceid, int *ndevices_return)
     char                *ptr;
     char                *end;
     int                 i;
-    char                *buf;
+    char                *buf = NULL;
 
     XExtDisplayInfo *extinfo = XInput_find_display(dpy);