[Issue #284] fix segfault in local timezone handling

gsmolk · gsmolk · commit 0d65e055cfbb · 2020-12-09T03:10:26.000-05:00
diff --git a/src/utils/configuration.c b/src/utils/configuration.c
@@ -1256,8 +1256,6 @@ parse_time(const char *value, time_t *result, bool utc_default)
 		*result -= tz;
 	}
 
-	pg_free(local_tz);
-
 	return true;
 }
 
@@ -1528,6 +1526,4 @@ time2iso(char *buf, size_t len, time_t time, bool utc)
 		snprintf(ptr, len - (ptr - buf), ":%02d",
 				 abs((int) offset % SECS_PER_HOUR) / SECS_PER_MINUTE);
 	}
-
-	pg_free(local_tz);
 }
diff --git a/src/utils/pgut.c b/src/utils/pgut.c
@@ -1251,7 +1251,7 @@ pgut_unsetenv(const char *key)
      * leak memory.
      */
 
-    envstr = (char *) malloc(strlen(key) + 2);
+    envstr = (char *) pgut_malloc(strlen(key) + 2);
     if (!envstr)                            /* not much we can do if no memory */
             return;
 

Original file line number	Diff line number	Diff line change
`@@ -1256,8 +1256,6 @@ parse_time(const char value, time_t result, bool utc_default)`
`1256`	`1256`	`*result -= tz;`
`1257`	`1257`	`}`
`1258`	`1258`
`1259`		`- pg_free(local_tz);`
`1260`		`-`
`1261`	`1259`	`return true;`
`1262`	`1260`	`}`
`1263`	`1261`
`@@ -1528,6 +1526,4 @@ time2iso(char *buf, size_t len, time_t time, bool utc)`
`1528`	`1526`	`snprintf(ptr, len - (ptr - buf), ":%02d",`
`1529`	`1527`	`abs((int) offset % SECS_PER_HOUR) / SECS_PER_MINUTE);`
`1530`	`1528`	`}`
`1531`		`-`
`1532`		`- pg_free(local_tz);`
`1533`	`1529`	`}`