diff options
| author | Peter Eisentraut | 2024-10-18 09:06:41 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2024-10-18 09:15:54 +0000 |
| commit | 24a36f91e32d6cbb8182c4cc6529d6e47587c988 (patch) | |
| tree | 78d65ba5b373c438937bea46cd9251ed41529e4f | |
| parent | 9272bdeac879ae44907422dd545f8d767b39c5ad (diff) | |
Fix strsep() use for SCRAM secrets parsing
The previous code (from commit 5d2e1cc117b) did not detect end of
string correctly, so it would fail to error out if fewer than the
expected number of fields were present, which could then later lead to
a crash when NULL string pointers are accessed.
Reported-by: Alexander Lakhin <[email protected]>
Reported-by: Ranier Vilela <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/[email protected]
| -rw-r--r-- | src/backend/libpq/auth-scram.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c index 03ddddc3c27..56df870e9ef 100644 --- a/src/backend/libpq/auth-scram.c +++ b/src/backend/libpq/auth-scram.c @@ -608,13 +608,17 @@ parse_scram_secret(const char *secret, int *iterations, * SCRAM-SHA-256$<iterations>:<salt>$<storedkey>:<serverkey> */ v = pstrdup(secret); - if ((scheme_str = strsep(&v, "$")) == NULL) + scheme_str = strsep(&v, "$"); + if (v == NULL) goto invalid_secret; - if ((iterations_str = strsep(&v, ":")) == NULL) + iterations_str = strsep(&v, ":"); + if (v == NULL) goto invalid_secret; - if ((salt_str = strsep(&v, "$")) == NULL) + salt_str = strsep(&v, "$"); + if (v == NULL) goto invalid_secret; - if ((storedkey_str = strsep(&v, ":")) == NULL) + storedkey_str = strsep(&v, ":"); + if (v == NULL) goto invalid_secret; serverkey_str = v; |