Fixes.

Author: dwsteele

src/backend/access/transam/xlog.c

@@ -10079,7 +10079,7 @@ do_pg_abort_backup(int code, Datum arg)
  * to require a backup label for recovery. Also recalculate the CRC.
  */
 void
-backup_control_file(uint8_t *controlFile)
+backup_control_file(uint8 *controlFile)
 {
 	ControlFileData *controlData = ((ControlFileData *)controlFile);
 
@@ -10098,6 +10098,8 @@ backup_control_file(uint8_t *controlFile)
 
 		Assert(crc_ok &&
 			   memcmp(dataDisk, controlFile, sizeof(ControlFileData)) == 0);
+
+		pfree(dataDisk);
 	}
 #endif
 

src/backend/access/transam/xlogrecovery.c

@@ -655,7 +655,7 @@ InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdown_ptr,
 		if (ControlFile->backupLabelRequired)
 			ereport(FATAL,
 					errmsg("could not find backup_label required for recovery"),
-					errhint("backup_label must be present for recovery to proceed"));
+					errhint("restore the backup_label file that was created during the backup."));
 
 		/*
 		 * If tablespace_map file is present without backup_label file, there

src/backend/backup/basebackup.c

@@ -335,7 +335,7 @@ perform_base_backup(basebackup_options *opt, bbsink *sink,
 			{
 				bool		sendtblspclinks = true;
 				char	   *backup_label;
-				uint8_t controlFile[PG_CONTROL_FILE_SIZE];
+				uint8		controlFile[PG_CONTROL_FILE_SIZE];
 
 				bbsink_begin_archive(sink, "base.tar");
 

src/include/access/xlog.h

@@ -326,7 +326,7 @@ extern void do_pg_backup_start(const char *backupidstr, bool fast,
 							   StringInfo tblspcmapfile);
 extern void do_pg_backup_stop(BackupState *state, bool waitforarchive);
 extern void do_pg_abort_backup(int code, Datum arg);
-extern void backup_control_file(uint8_t *controlFile);
+extern void backup_control_file(uint8 *controlFile);
 extern void register_persistent_abort_backup_handler(void);
 extern SessionBackupState get_backup_status(void);