[PGPRO-874] cfs.c: fix memory leak

Sokolov Yura · Sokolov Yura · commit e4c45650239a · 2017-07-27T20:34:35.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -1303,9 +1303,6 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 				 secs2*USECS_PER_SEC + usecs2);
 		}
 
-		pfree(file_path);
-		pfree(file_bck_path);
-		pfree(map_bck_path);
 		pfree(inodes);
 		pfree(newMap);
 
@@ -1328,6 +1325,9 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)
 	}
 
   FinishGC:
+	pfree(file_path);
+	pfree(file_bck_path);
+	pfree(map_bck_path);
 	if (background == CFS_BACKGROUND)
 	{
 		LWLockRelease(CfsGcLock);

Original file line number	Diff line number	Diff line change
`@@ -1303,9 +1303,6 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1303`	`1303`	`secs2*USECS_PER_SEC + usecs2);`
`1304`	`1304`	`}`
`1305`	`1305`
`1306`		`- pfree(file_path);`
`1307`		`- pfree(file_bck_path);`
`1308`		`- pfree(map_bck_path);`
`1309`	`1306`	`pfree(inodes);`
`1310`	`1307`	`pfree(newMap);`
`1311`	`1308`
`@@ -1328,6 +1325,9 @@ static bool cfs_gc_file(char* map_path, GC_CALL_KIND background)`
`1328`	`1325`	`}`
`1329`	`1326`
`1330`	`1327`	`FinishGC:`
	`1328`	`+ pfree(file_path);`
	`1329`	`+ pfree(file_bck_path);`
	`1330`	`+ pfree(map_bck_path);`
`1331`	`1331`	`if (background == CFS_BACKGROUND)`
`1332`	`1332`	`{`
`1333`	`1333`	`LWLockRelease(CfsGcLock);`