[PBCKP-216] correct resources freeing

Author: Daniel Shelepanov

src/pg_probackup.c

@@ -312,6 +312,7 @@ main(int argc, char *argv[])
 	PROGRAM_FULL_PATH = palloc0(MAXPGPATH);
 
 	// Setting C locale for numeric values in order to impose dot-based floating-point representation
+	memorize_environment_locale();
 	setlocale(LC_NUMERIC, "C");
 
 	/* Get current time */
@@ -1027,6 +1028,8 @@ main(int argc, char *argv[])
 			break;
 	}
 
+	free_environment_locale();
+
 	return 0;
 }
 

src/pg_probackup.h

@@ -905,6 +905,8 @@ extern InstanceConfig *readInstanceConfigFile(InstanceState *instanceState);
 /* in show.c */
 extern int do_show(CatalogState *catalogState, InstanceState *instanceState,
 				   time_t requested_backup_id, bool show_archive);
+extern void memorize_environment_locale(void);
+extern void free_environment_locale(void);
 
 /* in delete.c */
 extern void do_delete(InstanceState *instanceState, time_t backup_id);

src/show.c

@@ -72,22 +72,39 @@ static PQExpBufferData show_buf;
 static bool first_instance = true;
 static int32 json_level = 0;
 
+static const char* lc_env_locale;
 typedef enum {
-	LOCALE_PROBACKUP,
+	LOCALE_OUTPUT,
 	LOCALE_ENV
 } output_numeric_locale;
 
+#ifdef HAVE_USELOCALE
+static locale_t env_locale, out_locale;
+#endif
+void memorize_environment_locale() {
+	lc_env_locale = (const char *)getenv("LC_NUMERIC");
+	lc_env_locale = lc_env_locale != NULL ? lc_env_locale : "C";
+#ifdef HAVE_USELOCALE
+	env_locale = newlocale(LC_NUMERIC_MASK, lc_env_locale, (locale_t)0);
+	out_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
+#endif
+}
+
+void free_environment_locale() {
+#ifdef HAVE_USELOCALE
+	freelocale(env_locale);
+	freelocale(out_locale);
+#endif
+}
+
 static void set_output_numeric_locale(output_numeric_locale loc) {
-	const char *l = loc == LOCALE_PROBACKUP ? "C" :
-							getenv("LC_NUMERIC") != NULL ? (const char *)getenv("LC_NUMERIC") : "C";
-	// Setting environment-specified locale
 #ifdef HAVE_USELOCALE
-		uselocale(newlocale(LC_NUMERIC_MASK, l, (locale_t) 0));
+		uselocale(loc == LOCALE_OUTPUT ? out_locale : env_locale);
 #else
 #ifdef HAVE__CONFIGTHREADLOCALE
 		_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
 #endif
-		setlocale(LC_NUMERIC, l);
+		setlocale(LC_NUMERIC, loc == LOCALE_OUTPUT ? lc_env_locale : "C");
 #endif
 }
 
@@ -131,7 +148,7 @@ do_show(CatalogState *catalogState, InstanceState *instanceState,
 				show_instance(instanceState, INVALID_BACKUP_ID, true);
 		}
 		show_instance_end();
-		set_output_numeric_locale(LOCALE_PROBACKUP);
+		set_output_numeric_locale(LOCALE_OUTPUT);
 
 		return 0;
 	}
@@ -150,7 +167,7 @@ do_show(CatalogState *catalogState, InstanceState *instanceState,
 			show_instance(instanceState, requested_backup_id, false);
 
 		show_instance_end();
-		set_output_numeric_locale(LOCALE_PROBACKUP);
+		set_output_numeric_locale(LOCALE_OUTPUT);
 
 		return 0;
 	}
@@ -164,7 +181,7 @@ do_show(CatalogState *catalogState, InstanceState *instanceState,
 		else
 			show_backup(instanceState, requested_backup_id);
 
-		set_output_numeric_locale(LOCALE_PROBACKUP);
+		set_output_numeric_locale(LOCALE_OUTPUT);
 		return 0;
 	}
 }