database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-13 16:22:44 +03:00
Code Activity

Report better object limits in error messages for injection points

Browse Source 
Previously, error messages for oversized injection point names, libraries,
and functions showed buffer sizes (64, 128, 128) instead of the usable
character limits (63, 127, 127) as it did not count for the
zero-terminated byte, which was confusing.  These messages are adjusted
to show better the reality.

The limit enforced for the private area was also too strict by one byte,
as specifying a zone worth exactly INJ_PRIVATE_MAXLEN should be able to
work because three is no zero-terminated byte in this case.

This is a stylistic change (well, mostly, a private_area size of exactly
1024 bytes can be defined with this change, something that nobody seem
to care about based on the lack of complaints).  However, this is a
testing facility let's keep the logic consistent across all the branches
where this code exists, as there is an argument in favor of out-of-core
extensions that use injection points.

Author: Xuneng Zhou <xunengzhou@gmail.com>
Co-authored-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/CABPTF7VxYp4Hny1h+7ejURY-P4O5-K8WZg79Q3GUx13cQ6B2kg@mail.gmail.com
Backpatch-through: 17
This commit is contained in:
Michael Paquier
2025-11-12 10:18:50 +09:00
parent 79cd66f28c
commit 6e1535308c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/utils/misc/injection_point.c
View File

@@ -283,16 +283,16 @@ InjectionPointAttach(const char *name,
int free_idx; int free_idx;
if (strlen(name) >= INJ_NAME_MAXLEN) if (strlen(name) >= INJ_NAME_MAXLEN)
elog(ERROR, "injection point name %s too long (maximum of %u)", elog(ERROR, "injection point name %s too long (maximum of %u characters)",
name, INJ_NAME_MAXLEN); name, INJ_NAME_MAXLEN - 1);
if (strlen(library) >= INJ_LIB_MAXLEN) if (strlen(library) >= INJ_LIB_MAXLEN)
elog(ERROR, "injection point library %s too long (maximum of %u)", elog(ERROR, "injection point library %s too long (maximum of %u characters)",
library, INJ_LIB_MAXLEN); library, INJ_LIB_MAXLEN - 1);
if (strlen(function) >= INJ_FUNC_MAXLEN) if (strlen(function) >= INJ_FUNC_MAXLEN)
elog(ERROR, "injection point function %s too long (maximum of %u)", elog(ERROR, "injection point function %s too long (maximum of %u characters)",
function, INJ_FUNC_MAXLEN); function, INJ_FUNC_MAXLEN - 1);
if (private_data_size >= INJ_PRIVATE_MAXLEN) if (private_data_size > INJ_PRIVATE_MAXLEN)
elog(ERROR, "injection point data too long (maximum of %u)", elog(ERROR, "injection point data too long (maximum of %u bytes)",
INJ_PRIVATE_MAXLEN); INJ_PRIVATE_MAXLEN);
/* /*