NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit587de22

committed

Add missing error handling in pg_md5_hash().

It failed to provide an error string as expected for theadmittedly-unlikely case of OOM in pg_cryptohash_create().Also, make it initialize *errstr to NULL for success,as pg_md5_binary() does.Also add missing comments. Readers should not have toreverse-engineer the API spec for a publicly visible routine.

1 parent36d4efe commit587de22Copy full SHA for 587de22

File tree

1 file changed

+13

-0

lines changed

src/common
- md5_common.c

1 file changed

+13

-0

lines changed

`‎src/common/md5_common.c`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ bytesToHex(uint8 b[16], char *s)`
`57`	`57`	`* characters. you thus need to provide an array`
`58`	`58`	`* of 33 characters, including the trailing '\0'.`
`59`	`59`	`*`
	`60`	`+ * errstr filled with a constant-string error message`
	`61`	`+ * on failure return; NULL on success.`
	`62`	`+ *`
`60`	`63`	`*RETURNS false on failure (out of memory for internal buffers`
`61`	`64`	`* or MD5 computation failure) or true on success.`
`62`	`65`	`*`
`@@ -72,9 +75,13 @@ pg_md5_hash(const void buff, size_t len, char hexsum, const char **errstr)`
`72`	`75`	`uint8sum[MD5_DIGEST_LENGTH];`
`73`	`76`	`pg_cryptohash_ctx*ctx;`
`74`	`77`
	`78`	`+*errstr=NULL;`
`75`	`79`	`ctx=pg_cryptohash_create(PG_MD5);`
`76`	`80`	`if (ctx==NULL)`
	`81`	`+{`
	`82`	`+errstr=pg_cryptohash_error(NULL);/ returns OOM */`
`77`	`83`	`return false;`
	`84`	`+}`
`78`	`85`
`79`	`86`	`if (pg_cryptohash_init(ctx)<0\|\|`
`80`	`87`	`pg_cryptohash_update(ctx,buff,len)<0\|\|`
`@@ -90,6 +97,12 @@ pg_md5_hash(const void buff, size_t len, char hexsum, const char **errstr)`
`90`	`97`	`return true;`
`91`	`98`	`}`
`92`	`99`
	`100`	`+/*`
	`101`	`+ * pg_md5_binary`
	`102`	`+ *`
	`103`	`+ * As above, except that the MD5 digest is returned as a binary string`
	`104`	`+ * (of size MD5_DIGEST_LENGTH) rather than being converted to ASCII hex.`
	`105`	`+ */`
`93`	`106`	`bool`
`94`	`107`	`pg_md5_binary(constvoidbuff,size_tlen,voidoutbuf,constchar**errstr)`
`95`	`108`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit587de22

File tree

1 file changed

1 file changed

`‎src/common/md5_common.c`

0 commit comments