Commit83f4e80

Michael Paquier

committed

Always return an error in case of incorrect backup mode

Some code paths allowed an invalid backup mode to be passed, somethingrather crazy as they directly depended on that...

1 parent9ecd5ac commit83f4e80Copy full SHA for 83f4e80

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ catalog_read_ini(const char *path)`
`492`	`492`
`493`	`493`	`if (backup_mode)`
`494`	`494`	`{`
`495`		`-backup->backup_mode=parse_backup_mode(backup_mode,WARNING);`
	`495`	`+backup->backup_mode=parse_backup_mode(backup_mode);`
`496`	`496`	`free(backup_mode);`
`497`	`497`	`}`
`498`	`498`
`@@ -545,12 +545,14 @@ catalog_read_ini(const char *path)`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`BackupMode`
`548`		`-parse_backup_mode(constchar*value,intelevel)`
	`548`	`+parse_backup_mode(constchar*value)`
`549`	`549`	`{`
`550`	`550`	`constchar*v=value;`
`551`	`551`	`size_tlen;`
`552`	`552`
`553`		`-while (IsSpace(*v)) {v++; }`
	`553`	`+/* Skip all spaces detected */`
	`554`	`+while (IsSpace(*v))`
	`555`	`+v++;`
`554`	`556`	`len=strlen(v);`
`555`	`557`
`556`	`558`	`if (len>0&&pg_strncasecmp("full",v,len)==0)`
`@@ -560,7 +562,8 @@ parse_backup_mode(const char *value, int elevel)`
`560`	`562`	`elseif (len>0&&pg_strncasecmp("archive",v,len)==0)`
`561`	`563`	`returnBACKUP_MODE_ARCHIVE;`
`562`	`564`
`563`		`-elog(elevel,_("invalid backup-mode \"%s\""),value);`
	`565`	`+/* Backup mode is invalid, so leave with an error */`
	`566`	`+elog(ERROR_ARGS,_("invalid backup-mode \"%s\""),value);`
`564`	`567`	`returnBACKUP_MODE_INVALID;`
`565`	`568`	`}`
`566`	`569`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -330,5 +330,5 @@ if(!IsValidTime(tm)){`
`330`	`330`	`staticvoid`
`331`	`331`	`opt_backup_mode(pgut_optionopt,constchararg)`
`332`	`332`	`{`
`333`		`-current.backup_mode=parse_backup_mode(arg,ERROR_ARGS);`
	`333`	`+current.backup_mode=parse_backup_mode(arg);`
`334`	`334`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ extern const char *pgdata_exclude[];`
`230`	`230`
`231`	`231`	`/* in backup.c */`
`232`	`232`	`externintdo_backup(pgBackupOptionbkupopt);`
`233`		`-externBackupModeparse_backup_mode(constchar*value,intelevel);`
	`233`	`+externBackupModeparse_backup_mode(constchar*value);`
`234`	`234`	`externvoidcheck_server_version(void);`
`235`	`235`	`externboolfileExists(constchar*path);`
`236`	`236`

Comments

(0)