NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit80986e8

committed

Avoid returning undefined bytes in chkpass_in().

We can't really fix the problem that the result is defined to depend onrandom(), so it is still going to fail the "unstable input conversion"test in parse_type.c. However, we can at least satify valgrind. (Itlooks like this code used to be valgrind-clean, actually, until somebodydid a careless s/strncpy/strlcpy/g on it.)In passing, let's just make real sure that chkpass_out doesn't overrunits output buffer.No need for backpatch, I think, since this is just to satisfy debuggingtools.Asif Naeem

1 parent33e879c commit80986e8Copy full SHA for 80986e8

File tree

1 file changed

-3

lines changed

contrib/chkpass
- chkpass.c

1 file changed

-3

lines changed

`‎contrib/chkpass/chkpass.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ chkpass_in(PG_FUNCTION_ARGS)`
`65`	`65`	`/* special case to let us enter encrypted passwords */`
`66`	`66`	`if (*str==':')`
`67`	`67`	`{`
`68`		`-result= (chkpass*)palloc(sizeof(chkpass));`
	`68`	`+result= (chkpass*)palloc0(sizeof(chkpass));`
`69`	`69`	`strlcpy(result->password,str+1,13+1);`
`70`	`70`	`PG_RETURN_POINTER(result);`
`71`	`71`	`}`
`@@ -75,7 +75,7 @@ chkpass_in(PG_FUNCTION_ARGS)`
`75`	`75`	`(errcode(ERRCODE_DATA_EXCEPTION),`
`76`	`76`	`errmsg("password \"%s\" is weak",str)));`
`77`	`77`
`78`		`-result= (chkpass*)palloc(sizeof(chkpass));`
	`78`	`+result= (chkpass*)palloc0(sizeof(chkpass));`
`79`	`79`
`80`	`80`	`mysalt[0]=salt_chars[random()&0x3f];`
`81`	`81`	`mysalt[1]=salt_chars[random()&0x3f];`
`@@ -107,7 +107,7 @@ chkpass_out(PG_FUNCTION_ARGS)`
`107`	`107`
`108`	`108`	`result= (char*)palloc(16);`
`109`	`109`	`result[0]=':';`
`110`		`-strcpy(result+1,password->password);`
	`110`	`+strlcpy(result+1,password->password,15);`
`111`	`111`
`112`	`112`	`PG_RETURN_CSTRING(result);`
`113`	`113`	`}`

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!

Commit80986e8

File tree

1 file changed

1 file changed

`‎contrib/chkpass/chkpass.c`

0 commit comments