pgsql: Fix overread in JSON parsing errors for incomplete byte sequence

From: Michael Paquier <michael(at)paquier(dot)xyz>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Fix overread in JSON parsing errors for incomplete byte sequence
Date: 2024-05-09 03:46:36
Message-ID: E1s4ujr-0006aU-0Z@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers pgsql-hackers

Fix overread in JSON parsing errors for incomplete byte sequences

json_lex_string() relies on pg_encoding_mblen_bounded() to point to the
end of a JSON string when generating an error message, and the input it
uses is not guaranteed to be null-terminated.

It was possible to walk off the end of the input buffer by a few bytes
when the last bytes consist of an incomplete multi-byte sequence, as
token_terminator would point to a location defined by
pg_encoding_mblen_bounded() rather than the end of the input. This
commit switches token_terminator so as the error uses data up to the
end of the JSON input.

More work should be done so as this code could rely on an equivalent of
report_invalid_encoding() so as incorrect byte sequences can show in
error messages in a readable form. This requires work for at least two
cases in the JSON parsing API: an incomplete token and an invalid escape
sequence. A more complete solution may be too invasive for a backpatch,
so this is left as a future improvement, taking care of the overread
first.

A test is added on HEAD as test_json_parser makes this issue
straight-forward to check.

Note that pg_encoding_mblen_bounded() no longer has any callers. This
will be removed on HEAD with a separate commit, as this is proving to
encourage unsafe coding.

Author: Jacob Champion
Discussion: https://postgr.es/m/CAOYmi+ncM7pwLS3AnKCSmoqqtpjvA8wmCdoBtKA3ZrB2hZG6zA@mail.gmail.com
Backpatch-through: 13

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/855517307db8efd397d49163d65a4fd3bdcc41bc

Modified Files
--------------
src/common/jsonapi.c | 4 ++--
src/test/modules/test_json_parser/t/002_inline.pl | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)

Responses

Browse pgsql-committers by date

  From Date Subject
Next Message Bruce Momjian 2024-05-09 03:54:53 pgsql: doc: first draft of Postgres 17 release notes
Previous Message Bruce Momjian 2024-05-08 17:37:15 Re: pgsql: Add allow_alter_system GUC.

Browse pgsql-hackers by date

  From Date Subject
Next Message Paul Jungwirth 2024-05-09 03:47:45 Re: PERIOD foreign key feature
Previous Message David Rowley 2024-05-09 03:28:45 Re: Expand applicability of aggregate's sortop optimization