Commite684ab5

committed

Add additional safety check against invalid backup label file

It was already checking for invalid data after "BACKUP FROM", butwould possibly crash if "BACKUP FROM" was missing altogether.found by Coverity

1 parentacfaa59 commite684ab5Copy full SHA for e684ab5

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9481,7 +9481,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive)`
`9481`	`9481`	`* during the backup.`
`9482`	`9482`	`*/`
`9483`	`9483`	`ptr=strstr(remaining,"BACKUP FROM:");`
`9484`		`-if (sscanf(ptr,"BACKUP FROM: %19s\n",backupfrom)!=1)`
	`9484`	`+if (!ptr\|\|sscanf(ptr,"BACKUP FROM: %19s\n",backupfrom)!=1)`
`9485`	`9485`	`ereport(ERROR,`
`9486`	`9486`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
`9487`	`9487`	`errmsg("invalid data in file \"%s\"",BACKUP_LABEL_FILE)));`

Comments

(0)