diff options
| author | Noah Misch <noah@leadboat.com> | 2025-05-05 04:52:04 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2025-05-05 04:52:08 -0700 |
| commit | 3f2ab73934ab1e27151ecd14fd7d8ef602555093 (patch) | |
| tree | 104f0bf916d41f0a07d46bd1c75a230399b7c0b2 /src/common/jsonapi.c | |
| parent | 258cde839d902ad9dd41cbd7ab58ebf4ba086874 (diff) | |
| download | postgresql-3f2ab73934ab1e27151ecd14fd7d8ef602555093.tar.gz postgresql-3f2ab73934ab1e27151ecd14fd7d8ef602555093.zip | |
With GB18030, prevent SIGSEGV from reading past end of allocation.
With GB18030 as source encoding, applications could crash the server via
SQL functions convert() or convert_from(). Applications themselves
could crash after passing unterminated GB18030 input to libpq functions
PQescapeLiteral(), PQescapeIdentifier(), PQescapeStringConn(), or
PQescapeString(). Extension code could crash by passing unterminated
GB18030 input to jsonapi.h functions. All those functions have been
intended to handle untrusted, unterminated input safely.
A crash required allocating the input such that the last byte of the
allocation was the last byte of a virtual memory page. Some malloc()
implementations take measures against that, making the SIGSEGV hard to
reach. Back-patch to v13 (all supported versions).
Author: Noah Misch <noah@leadboat.com>
Author: Andres Freund <andres@anarazel.de>
Reviewed-by: Masahiko Sawada <sawada.mshk@gmail.com>
Backpatch-through: 13
Security: CVE-2025-4207
Diffstat (limited to 'src/common/jsonapi.c')
| -rw-r--r-- | src/common/jsonapi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c index 8da2bdb271b..573375618d7 100644 --- a/src/common/jsonapi.c +++ b/src/common/jsonapi.c @@ -700,8 +700,11 @@ json_lex_string(JsonLexContext *lex) } while (0) #define FAIL_AT_CHAR_END(code) \ do { \ - char *term = s + pg_encoding_mblen(lex->input_encoding, s); \ - lex->token_terminator = (term <= end) ? term : end; \ + ptrdiff_t remaining = end - s; \ + int charlen; \ + charlen = pg_encoding_mblen_or_incomplete(lex->input_encoding, \ + s, remaining); \ + lex->token_terminator = (charlen <= remaining) ? s + charlen : end; \ return code; \ } while (0) |