upload patches

Change-Id: Ib4a3e3af987516b1006a2cbb9d99d5e2dda143f1

diff --git a/debian/rules b/debian/rules
index 369cfe3..2f2461f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 
 include debian/xsfbs/xsfbs.mk
 
-CFLAGS = -Wall -g
+CFLAGS = -Wall -g 
 CFLAGS += -D_F_GESTURE_EXTENSION_
 CFLAGS += -D_F_SUPPORT_PREFERRED_NAME_
 #CFLAGS += -D_DEBUG_MT_SEQUENCE_

diff --git a/src/evdevmultitouch.c b/src/evdevmultitouch.c
index 2bc3b5b..c3803e1 100755 (executable)
--- a/src/evdevmultitouch.c
+++ b/src/evdevmultitouch.c
@@ -1397,8 +1397,6 @@ EvdevMultitouchProcessEvent(InputInfoPtr pInfo, struct input_event *ev)
             break;
         case EV_KEY:
             return;
-            EvdevMultitouchProcessKeyEvent(pInfo, ev);
-            break;
         case EV_SYN:
 #ifdef _DEBUG_MT_SEQUENCE_
             if( ev->code == SYN_MT_REPORT )
@@ -1903,7 +1901,10 @@ EvdevMultitouchAddAbsClass(DeviceIntPtr device)
                                        GetMotionHistory,
 #endif
                                        GetMotionHistorySize(), Absolute))
+    {
+        free(atoms);
         return !Success;
+    }
 
     for (axis = ABS_X; axis <= ABS_MAX; axis++) {
         int axnum = g_pEvdevMultitouch->axis_map[axis];
@@ -2008,7 +2009,10 @@ EvdevMultitouchAddRelClass(DeviceIntPtr device)
                                        GetMotionHistory,
 #endif
                                        GetMotionHistorySize(), Relative))
+    {
+        free(atoms);
         return !Success;
+    }
 
     for (axis = REL_X; axis <= REL_MAX; axis++)
     {
@@ -2054,7 +2058,10 @@ EvdevMultitouchAddButtonClass(DeviceIntPtr device)
                                      labels,
 #endif
                                      pEvdevMultitouch->btnmap))
+    {
+        free(labels);
         return !Success;
+    }
 
     free(labels);
     return Success;
@@ -2419,7 +2426,7 @@ EvdevMultitouchCacheCompare(InputInfoPtr pInfo, BOOL compare)
 {
     int i;
     EvdevMultitouchPtr pEvdevMultitouch = pInfo->private;
-    size_t len;
+    int len;
 
     char name[1024]                  = {0};
     unsigned long bitmask[NLONGS(EV_CNT)]      = {0};
@@ -3159,7 +3166,7 @@ EvdevMultitouchPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
     return Success;
 
 error:
-    if (pInfo->fd >= 0)
+    if ((pInfo) && (pInfo->fd >= 0))
         close(pInfo->fd);
     return rc;
 }
@@ -3807,6 +3814,7 @@ EvdevMultitouchCreateSubDevice(InputInfoPtr pInfo, int id) {
 
     if( !name )
     {
+        EvdevMultitouchFreeInputOpts(input_options);
         xf86DrvMsg(-1, X_ERROR, "[X11][%s] Failed to allocate memory !\n", __FUNCTION__);
         return NULL;
     }