mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

chkpass: check for NULL return value from crypt()

Browse Source 
Report from Jozef Mlich using Coverity
This commit is contained in:
Bruce Momjian 2014-01-31 20:19:53 -05:00
parent 85317e88cc
commit 6afe200cee
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/chkpass/chkpass.c
View File

@ -70,6 +70,7 @@ chkpass_in(PG_FUNCTION_ARGS)
char *str = PG_GETARG_CSTRING(0); char *str = PG_GETARG_CSTRING(0);
chkpass *result; chkpass *result;
char mysalt[4]; char mysalt[4];
char *crypt_output;
static char salt_chars[] = static char salt_chars[] =
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
@ -92,7 +93,13 @@ chkpass_in(PG_FUNCTION_ARGS)
mysalt[1] = salt_chars[random() & 0x3f]; mysalt[1] = salt_chars[random() & 0x3f];
mysalt[2] = 0; /* technically the terminator is not necessary mysalt[2] = 0; /* technically the terminator is not necessary
* but I like to play safe */ * but I like to play safe */
strcpy(result->password, crypt(str, mysalt));
if ((crypt_output = crypt(str, mysalt)) == NULL)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("crypt() failed")));
strcpy(result->password, crypt_output);
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);
} }