Merge branch 'master' of github.com:xythobuz/LED-Cube

CubeControl/helper/unixSerial.c

 		size++;
 	}
 	files = (char **)malloc((size + 1) * sizeof(char *));
-	files[size] = NULL;
+	files[size++] = NULL;
 	closedir(dir);
 	dir = opendir("/dev/");
 	while ((ent = readdir(dir)) != NULL) {
 
 	char *tmp = NULL;
 	// Fix every string, addin /dev/ in front of it...
-	for (i = 0; i < size; i++) {
+	for (i = 0; i < (size - 1); i++) {
 		tmp = (char *)malloc((strlen(files[i]) + 6) * sizeof(char));
 		tmp[0] = '/';
 		tmp[1] = 'd';
 	char** fin = NULL;
 	int i = 0, j = 0, f, g;
 
-	fin = (char **)malloc((size + 1) * sizeof(char *));
-	fin[size] = NULL;
+	printf("JNI: Got files in /dev/\n");
+
+	fin = (char **)malloc(size * sizeof(char *));
+	fin[size - 1] = NULL;
 	while (files[i] != NULL) {
 		if (strstr(files[i], SEARCH) != NULL) {
 			f = serialOpen(files[i]);
 	}
 	free(files);
 
-	char** finish = (char **)malloc((j + 1) * sizeof(char *));
-	for (i = 0; i < (j + 1); i++) {
-		finish[i] = fin[i];
-	}
-	free(fin);
-
-	return finish;
+	return fin;
 }

CubeControl/serialHelper.c

 JNIEXPORT jstring JNICALL Java_HelperUtility_getPorts(JNIEnv *env, jclass class) {
 	char **ports = getSerialPorts();
 	char *string = NULL;
-	int length = 0, leng2 = 0, lengthabs = 0;;
+	int length = 0, leng2 = 0, lengthabs = 0;
+
+	printf("JNI: Got serial ports...\n");
+
+	// Count how much memory we need for string of all ports, with \n in between
 	while (ports[length] != NULL) {
+		printf("JNI: Startin count...\n");
 		while (ports[length][leng2] != '\0') {
 			leng2++;
 		}
+		printf("JNI: Counted %s\n", ports[length]);
 		lengthabs += leng2;
 		leng2 = 0;
 		length++;
 	}
-	
 	length += lengthabs;
-	string = (char *)malloc((length * sizeof(char)) + 1);
-	
+
+	printf("JNI: Counted serial ports...\n");
+
+	string = (char *)malloc((length + 1) * sizeof(char));
+	if (string == NULL) {
+		printf("JNI: Not enough memory!\n");
+		return (*env)->NewStringUTF(env, NULL);
+	}
+
 	length = 0;
 	lengthabs = 0;
 	while (ports[length] != NULL) {