Merge branch 'REL_2_5' into REL_2_6

Author: funny-falcon

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;
 }
 

src/utils/pgut.c

@@ -979,6 +979,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);
+}
+
 #ifdef WIN32
 static int select_win32(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval * timeout);
 #define select		select_win32

src/utils/pgut.h

@@ -65,6 +65,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)))