database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Fix CRC check handling in get_controlfile

Browse Source 
The previous patch broke this by returning NULL for a failed CRC check,
which pg_controldata would then try to read.  Fix by returning the
result of the CRC check in a separate argument.

Michael Paquier and myself
This commit is contained in:
Peter Eisentraut
2016-09-28 12:00:00 -04:00
parent 308985b0b4
commit e79e6c4da1
5 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/controldata_utils.c
View File

@@ -29,21 +29,24 @@
#include "port/pg_crc32c.h"
/*
* get_controlfile(char *DataDir, const char *progname)
* get_controlfile(char *DataDir, const char *progname, bool *crc_ok_p)
*
* Get controlfile values. The caller is responsible
* for pfreeing the result.
* Get controlfile values. The result is returned as a palloc'd copy of the
* control file data.
*
* Returns NULL if the CRC did not match.
* crc_ok_p can be used by the caller to see whether the CRC of the control
* file data is correct.
*/
ControlFileData *
get_controlfile(const char *DataDir, const char *progname)
get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p)
{
ControlFileData *ControlFile;
int fd;
char ControlFilePath[MAXPGPATH];
pg_crc32c crc;
AssertArg(crc_ok_p);
ControlFile = palloc(sizeof(ControlFileData));
snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
@@ -83,11 +86,7 @@ get_controlfile(const char *DataDir, const char *progname)
offsetof(ControlFileData, crc));
FIN_CRC32C(crc);
if (!EQ_CRC32C(crc, ControlFile->crc))
{
pfree(ControlFile);
return NULL;
}
*crc_ok_p = EQ_CRC32C(crc, ControlFile->crc);
/* Make sure the control file is valid byte order. */
if (ControlFile->pg_control_version % 65536 == 0 &&