ts_setup: fix possible memory leak

Fixes #151
libts · Apr 29, 2019 · 2be6a0e · 2be6a0e
1 parent 2abfc27
commit 2be6a0e
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/ts_setup.c b/src/ts_setup.c
@@ -58,7 +58,6 @@ static char *scan_devices(void)
 	struct dirent **namelist;
 	int i, ndev;
 	char *filename = NULL;
-	int have_touchscreen = 0;
 	long propbit[BITS_TO_LONGS(INPUT_PROP_MAX)] = {0};
 
 #ifdef DEBUG
@@ -85,30 +84,26 @@ static char *scan_devices(void)
 			close(fd);
 			continue;
 		} else {
-			have_touchscreen = 1;
-		}
-
-		close(fd);
-		free(namelist[i]);
-
-		if (have_touchscreen) {
+			close(fd);
 			filename = malloc(strlen(DEV_INPUT_EVENT) +
 					  strlen(EVENT_DEV_NAME) +
 					  12);
 			if (!filename)
-				return NULL;
+				break;
 
 			sprintf(filename, "%s/%s%d",
 				DEV_INPUT_EVENT, EVENT_DEV_NAME,
 				i);
+			break;
 		}
+	}
 
-		free(namelist);
+	for (i = 0; i < ndev; ++i)
+		free(namelist[i]);
 
-		return filename;
-	}
+	free(namelist);
 
-	return NULL;
+	return filename;
 }
 
 #endif /* __linux__ */