fix memory leak in config_get_opt

funny-falcon · funny-falcon · commit be949fd91e9e · 2022-11-25T16:23:56.000+03:00
diff --git a/src/utils/configuration.c b/src/utils/configuration.c
@@ -538,6 +538,9 @@ config_get_opt(int argc, char **argv, ConfigOption cmd_options[],
 		assign_option(opt, optarg, SOURCE_CMD);
 	}
 
+	pgut_free(optstring);
+	pgut_free(longopts);
+
 	return optind;
 }
 
diff --git a/src/utils/pgut.c b/src/utils/pgut.c
@@ -993,6 +993,12 @@ pgut_str_strip_trailing_filename(const char *filepath, const char *filename)
 		return pgut_strndup(filepath, fp_len);
 }
 
+void
+pgut_free(void *p)
+{
+	free(p);
+}
+
 FILE *
 pgut_fopen(const char *path, const char *mode, bool missing_ok)
 {
diff --git a/src/utils/pgut.h b/src/utils/pgut.h
@@ -64,6 +64,7 @@ extern void *pgut_realloc(void *p, size_t size);
 extern char *pgut_strdup(const char *str);
 extern char *pgut_strndup(const char *str, size_t n);
 extern char *pgut_str_strip_trailing_filename(const char *filepath, const char *filename);
+extern void  pgut_free(void *p);
 
 #define pgut_new(type)			((type *) pgut_malloc(sizeof(type)))
 #define pgut_new0(type)			((type *) pgut_malloc0(sizeof(type)))

Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,9 @@ config_get_opt(int argc, char **argv, ConfigOption cmd_options[],`
`538`	`538`	`assign_option(opt, optarg, SOURCE_CMD);`
`539`	`539`	`}`
`540`	`540`
	`541`	`+ pgut_free(optstring);`
	`542`	`+ pgut_free(longopts);`
	`543`	`+`
`541`	`544`	`return optind;`
`542`	`545`	`}`
`543`	`546`
Original file line number	Diff line number	Diff line change
`@@ -993,6 +993,12 @@ pgut_str_strip_trailing_filename(const char filepath, const char filename)`
`993`	`993`	`return pgut_strndup(filepath, fp_len);`
`994`	`994`	`}`
`995`	`995`
	`996`	`+void`
	`997`	`+pgut_free(void *p)`
	`998`	`+{`
	`999`	`+ free(p);`
	`1000`	`+}`
	`1001`	`+`
`996`	`1002`	`FILE *`
`997`	`1003`	`pgut_fopen(const char path, const char mode, bool missing_ok)`
`998`	`1004`	`{`