Fix a memory leak and a dead-code

Change-Id: I1966c9a45f1190ff91b6ed7e237a403000cb48f6

diff --git a/packaging/xorg-x11-drv-evdev.spec b/packaging/xorg-x11-drv-evdev.spec
index 344fe8b..3907757 100644 (file)
--- a/packaging/xorg-x11-drv-evdev.spec
+++ b/packaging/xorg-x11-drv-evdev.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/xorg/driver/xserver-xorg-input-evdev xserver-xorg-input-evdev 2.3.2 1bd95071427e460187b090bc5ff5a2d880fe156a
 Name:  xorg-x11-drv-evdev
 Summary:    Xorg X11 evdev input driver
-Version: 2.7.0
+Version: 2.7.1
 Release:    3
 Group:      System/X Hardware Support
 License:    MIT
@@ -61,4 +61,4 @@ cp -af COPYING %{buildroot}/usr/share/license/%{name}
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/xorg/evdev-properties.h
-%{_libdir}/pkgconfig/xorg-evdev.pc
\ No newline at end of file
+%{_libdir}/pkgconfig/xorg-evdev.pc

diff --git a/src/evdev.c b/src/evdev.c
index 0659e4b..b87d79f 100755 (executable)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1794,7 +1794,10 @@ EvdevAddButtonClass(DeviceIntPtr device)
 
     if (!InitButtonClassDeviceStruct(device, pEvdev->num_buttons, labels,
                                      pEvdev->btnmap))
+    {
+        free(labels);
         return !Success;
+    }
 
     free(labels);
     return Success;
@@ -2793,7 +2796,7 @@ EvdevSetConfineRegion(InputInfoPtr pInfo, int num_item, int region[6])
                        pEvdev->flags |= EVDEV_CONFINE_REGION;
                }
        }
-       else if( num_item == 1 )
+       else//if( num_item == 1 )
        {
                xf86IDrvMsg(pInfo, X_INFO, "[X11][SetConfineRegion] num_item == 1\n");
                if( !region[0] && (pEvdev->flags & EVDEV_CONFINE_REGION) )
@@ -2803,8 +2806,6 @@ EvdevSetConfineRegion(InputInfoPtr pInfo, int num_item, int region[6])
                        pEvdev->flags &= ~EVDEV_CONFINE_REGION;
                }
        }
-       else
-               xf86IDrvMsg(pInfo, X_INFO, "[X11][SetConfineRegion] num_item == %d\n", num_item);
 }
 #endif /* #ifdef _F_EVDEV_CONFINE_REGION_ */