Fix access to uninitalized variables in GCC

knizhnik · knizhnik · commit d06bc61a3f32 · 2017-01-13T17:14:56.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -559,6 +559,8 @@ static bool cfs_gc_file(char* map_path)
 						close(md2);
 						md2 = -1;
 						newSize = pg_atomic_read_u32(&newMap->usedSize);
+						virtSize = pg_atomic_read_u32(&newMap->virtSize);
+						n_pages = virtSize / BLCKSZ;
 						remove_backups = false;
 						goto ReplaceMap;
 					}
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
@@ -502,12 +502,15 @@ mdunlinkfork(RelFileNodeBackend rnode, ForkNumber forkNum, bool isRedo)
 		if (md_use_compression(rnode, forkNum))
 		{
 			File file = PathNameOpenFile(path, O_RDWR | PG_BINARY | PG_COMPRESSION, 0);
+			ret = -1;
 			if (file >= 0) {
 				elog(LOG, "Truncate file %s", path);
 				if (FileTruncate(file, 0) < 0) { 
 					ereport(WARNING,
 							(errcode_for_file_access(),
 							 errmsg("could not truncate file \"%s\": %m", path)));
+				} else { 
+					ret = 0;
 				}
 			}
 			FileClose(file);

Original file line number	Diff line number	Diff line change
`@@ -559,6 +559,8 @@ static bool cfs_gc_file(char* map_path)`
`559`	`559`	`close(md2);`
`560`	`560`	`md2 = -1;`
`561`	`561`	`newSize = pg_atomic_read_u32(&newMap->usedSize);`
	`562`	`+ virtSize = pg_atomic_read_u32(&newMap->virtSize);`
	`563`	`+ n_pages = virtSize / BLCKSZ;`
`562`	`564`	`remove_backups = false;`
`563`	`565`	`goto ReplaceMap;`
`564`	`566`	`}`
Original file line number	Diff line number	Diff line change
`@@ -502,12 +502,15 @@ mdunlinkfork(RelFileNodeBackend rnode, ForkNumber forkNum, bool isRedo)`
`502`	`502`	`if (md_use_compression(rnode, forkNum))`
`503`	`503`	`{`
`504`	`504`	`File file = PathNameOpenFile(path, O_RDWR \| PG_BINARY \| PG_COMPRESSION, 0);`
	`505`	`+ ret = -1;`
`505`	`506`	`if (file >= 0) {`
`506`	`507`	`elog(LOG, "Truncate file %s", path);`
`507`	`508`	`if (FileTruncate(file, 0) < 0) {`
`508`	`509`	`ereport(WARNING,`
`509`	`510`	`(errcode_for_file_access(),`
`510`	`511`	`errmsg("could not truncate file \"%s\": %m", path)));`
	`512`	`+ } else {`
	`513`	`+ ret = 0;`
`511`	`514`	`}`
`512`	`515`	`}`
`513`	`516`	`FileClose(file);`