sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-13 01:13:08 -04:00
Code Issues Projects Releases Wiki Activity

Fix memory leaks in px_crypt_shacrypt().

Browse Source 
Per Coverity.  I don't think these are of any actual significance
since the function ought to be invoked in a short-lived context.
Still, if it's trying to be neat it should get it right.

Also const-ify a constant and fix up typedef formatting.
This commit is contained in:
Tom Lane 2025-04-06 11:57:22 -04:00
parent 2e4ccf1b45
commit 8ab6ef2bb8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/pgcrypto/crypt-sha.c
View File

@ -56,7 +56,7 @@ typedef enum
PGCRYPTO_SHA256CRYPT = 0,
PGCRYPTO_SHA512CRYPT = 1,
PGCRYPTO_SHA_UNKOWN
} PGCRYPTO_SHA_t;
} PGCRYPTO_SHA_t;
static unsigned char _crypt_itoa64[64 + 1] =
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
@ -68,7 +68,7 @@ char *
px_crypt_shacrypt(const char *pw, const char *salt, char *passwd, unsigned dstlen)
{
static const char rounds_prefix[] = "rounds=";
static char *magic_bytes[2] = {"$5$", "$6$"};
static const char *magic_bytes[2] = {"$5$", "$6$"};
/* Used to create the password hash string */
StringInfo out_buf = NULL;
@ -96,10 +96,6 @@ px_crypt_shacrypt(const char *pw, const char *salt, char *passwd, unsigned dstle
unsigned int len,
salt_len = 0;
/* Init result buffer */
out_buf = makeStringInfoExt(PX_SHACRYPT_BUF_LEN);
decoded_salt = makeStringInfoExt(PX_SHACRYPT_SALT_MAX_LEN);
/* Sanity checks */
if (!passwd)
return NULL;
@ -116,6 +112,10 @@ px_crypt_shacrypt(const char *pw, const char *salt, char *passwd, unsigned dstle
if (dstlen < PX_SHACRYPT_BUF_LEN)
elog(ERROR, "insufficient result buffer size to encrypt password");
/* Init result buffer */
out_buf = makeStringInfoExt(PX_SHACRYPT_BUF_LEN);
decoded_salt = makeStringInfoExt(PX_SHACRYPT_SALT_MAX_LEN);
/* Init contents of buffers properly */
memset(&sha_buf, '\0', sizeof(sha_buf));
memset(&sha_buf_tmp, '\0', sizeof(sha_buf_tmp));
@ -630,8 +630,8 @@ error:
if (digestB != NULL)
px_md_free(digestB);
if (out_buf != NULL)
destroyStringInfo(out_buf);
destroyStringInfo(out_buf);
destroyStringInfo(decoded_salt);
ereport(ERROR,
errcode(ERRCODE_INTERNAL_ERROR),

1
src/tools/pgindent/typedefs.list
View File

@ -1825,6 +1825,7 @@ PGAlignedBlock
PGAlignedXLogBlock
PGAsyncStatusType
PGCALL2
PGCRYPTO_SHA_t
PGChecksummablePage
PGContextVisibility
PGErrorVerbosity