sway

commit eff55d0de1eee416bc4669a4d17270c80e95fab4
parent 780893a9338fe948cbb12c3b0ce3942ec8001ccf
Author: taiyu <taiyu.len@gmail.com>
Date:   Tue, 18 Aug 2015 01:32:54 -0700

fixed doubling memory bug for config lines longer then 128

Diffstat:
M
sway/readline.c
 | 
13
++++++-------

1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/sway/readline.c b/sway/readline.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 char *read_line(FILE *file) {
-	int i = 0, length = 0, size = 128;
+	int length = 0, size = 128;
 	char *string = malloc(size);
 	if (!string) {
 		return NULL;
@@ -16,21 +16,20 @@ char *read_line(FILE *file) {
 		if (c == '\r') {
 			continue;
 		}
-		if (i == size) {
-			string = realloc(string, length *= 2);
+		if (length == size) {
+			string = realloc(string, size *= 2);
 			if (!string) {
 				return NULL;
 			}
 		}
-		string[i++] = (char)c;
-		length++;
+		string[length++] = c;
 	}
-	if (i + 1 != size) {
+	if (length + 1 == size) {
 		string = realloc(string, length + 1);
 		if (!string) {
 			return NULL;
 		}
 	}
-	string[i] = '\0';
+	string[length] = '\0';
 	return string;
 }