css_property_parser_gen: improve memory management

Author: boxerab

src/parse/properties/css_property_parser_gen.c

@@ -549,16 +549,17 @@ int main(int argc, char **argv)
 	bool only_ident = true; /* if the only token type is ident */
 	bool is_generic = false;
 
-	struct keyval_list base;
-	struct keyval_list IDENT;
-	struct keyval_list IDENT_LIST;
-	struct keyval_list LENGTH_UNIT;
-	struct keyval_list URI;
-	struct keyval_list WRAP;
-	struct keyval_list NUMBER;
-	struct keyval_list COLOR;
-	struct keyval_list CALC;
-
+	struct keyval_list base = {0};
+	struct keyval_list IDENT = {0};
+	struct keyval_list IDENT_LIST = {0};
+	struct keyval_list LENGTH_UNIT = {0};
+	struct keyval_list URI = {0};
+	struct keyval_list WRAP = {0};
+	struct keyval_list NUMBER = {0};
+	struct keyval_list COLOR = {0};
+	struct keyval_list CALC = {0};
+
+	int ret = 0;
 
 	if (argc < 2) {
 		fprintf(stderr,"Usage: %s [-o <filename>] <descriptor>\n", argv[0]);
@@ -580,31 +581,27 @@ int main(int argc, char **argv)
 		outputf = stdout;
 		descriptor = strdup(argv[1]);
 	}
+	if (!descriptor) {
+		if (outputf != stdout) fclose(outputf);
+		return 2;
+	}
 	curpos = descriptor;
 
-	base.count = 0;
-	IDENT.count = 0;
-	URI.count = 0;
-	WRAP.count = 0;
-	NUMBER.count = 0;
-	COLOR.count = 0;
-	LENGTH_UNIT.count = 0;
-	IDENT_LIST.count = 0;
-	CALC.count = 0;
-
 	curlist = &base;
 
 	while (*curpos != 0) {
+		bool rkv_needs_free = true;
 		rkv = get_keyval(&curpos);
 		if (rkv == NULL) {
 			fprintf(stderr,"Token error at offset %ld\n",
 					(long)(curpos - descriptor));
-			fclose(outputf);
-			return 2;
+			ret = 2;
+			goto cleanup;
 		}
 
 		if (strcmp(rkv->key, "WRAP") == 0) {
 			WRAP.item[WRAP.count++] = rkv;
+			rkv_needs_free = false;
 			only_ident = false;
 		} else if (curlist == &base && strcmp(rkv->key, "NUMBER") == 0) {
 			if (rkv->val[0] == '(') {
@@ -613,6 +610,7 @@ int main(int argc, char **argv)
 				curlist = &base;
 			} else {
 				NUMBER.item[NUMBER.count++] = rkv;
+				rkv_needs_free = false;
 			}
 			only_ident = false;
 		} else if (strcmp(rkv->key, "IDENT") == 0) {
@@ -653,26 +651,30 @@ int main(int argc, char **argv)
 			do_token_check = false;
 		} else if (strcmp(rkv->key, "COLOR") == 0) {
 			COLOR.item[COLOR.count++] = rkv;
+			rkv_needs_free = false;
 			do_token_check = false;
 			only_ident = false;
 		} else if (strcmp(rkv->key, "URI") == 0) {
 			URI.item[URI.count++] = rkv;
+			rkv_needs_free = false;
 			only_ident = false;
 		} else if (strcmp(rkv->key, "GENERIC") == 0) {
 			is_generic = true;
 		} else {
 			/* just append to current list */
 			curlist->item[curlist->count++] = rkv;
+			rkv_needs_free = false;
 		}
+		if (rkv_needs_free)
+			free(rkv);
 	}
 
 	if (base.count != 1) {
-		fprintf(stderr,"Incorrect base element count (got %d expected 1)\n", base.count);
-		fclose(outputf);
-		return 3;
+		fprintf(stderr, "Incorrect base element count (got %d expected 1)\n", base.count);
+		ret = 3;
+		goto cleanup;
 	}
 
-
 	/* header */
 	output_header(outputf, descriptor, base.item[0], is_generic);
 
@@ -707,10 +709,28 @@ int main(int argc, char **argv)
 		}
 
 		output_footer(outputf);
-
 	}
 
-	fclose(outputf);
-
-	return 0;
-}
+cleanup:
+	/* Clean up allocated keyvals */
+	for (int i = 0; i < base.count; i++) {
+		free(base.item[i]);
+	}
+	for (int i = 0; i < IDENT.count; i++) {
+		if (IDENT.item[i] != &ident_inherit && IDENT.item[i] != &ident_initial &&
+		    IDENT.item[i] != &ident_revert && IDENT.item[i] != &ident_unset) {
+			free(IDENT.item[i]);
+		}
+	}
+	for (int i = 0; i < URI.count; i++) free(URI.item[i]);
+	for (int i = 0; i < WRAP.count; i++) free(WRAP.item[i]);
+	for (int i = 0; i < NUMBER.count; i++) free(NUMBER.item[i]);
+	for (int i = 0; i < COLOR.count; i++) free(COLOR.item[i]);
+	for (int i = 0; i < LENGTH_UNIT.count; i++) free(LENGTH_UNIT.item[i]);
+	for (int i = 0; i < IDENT_LIST.count; i++) free(IDENT_LIST.item[i]);
+	for (int i = 0; i < CALC.count; i++) free(CALC.item[i]);
+	free(descriptor);
+	if (outputf != stdout) fclose(outputf);
+
+	return ret;
+}