Commitf734743

committed

Improve error messages for bytea decoding failures.

Craig Ringer

1 parent8522f21 commitf734743Copy full SHA for f734743

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ b64_decode(const char src, unsigned len, char dst)`
`292`	`292`	`else`
`293`	`293`	`ereport(ERROR,`
`294`	`294`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`295`		`-errmsg("unexpected \"=\"")));`
	`295`	`+errmsg("unexpected \"=\" while decoding base64 sequence")));`
`296`	`296`	`}`
`297`	`297`	`b=0;`
`298`	`298`	`}`
`@@ -304,7 +304,7 @@ b64_decode(const char src, unsigned len, char dst)`
`304`	`304`	`if (b<0)`
`305`	`305`	`ereport(ERROR,`
`306`	`306`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`307`		`-errmsg("invalid symbol")));`
	`307`	`+errmsg("invalid symbol '%c' while decoding base64 sequence", (int)c)));`
`308`	`308`	`}`
`309`	`309`	`/* add it to buffer */`
`310`	`310`	`buf= (buf <<6)+b;`
`@@ -324,7 +324,8 @@ b64_decode(const char src, unsigned len, char dst)`
`324`	`324`	`if (pos!=0)`
`325`	`325`	`ereport(ERROR,`
`326`	`326`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`327`		`-errmsg("invalid end sequence")));`
	`327`	`+errmsg("invalid base64 end sequence"),`
	`328`	`+errhint("input data is missing padding, truncated, or otherwise corrupted")));`
`328`	`329`
`329`	`330`	`returnp-dst;`
`330`	`331`	`}`

Comments

(0)