diff options
| author | Peter Eisentraut | 2025-01-15 15:53:53 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2025-01-15 15:58:44 +0000 |
| commit | de9037d0d085f25d3c220a45bfbb7abc5794a0c8 (patch) | |
| tree | 3c5f8f1a85d205f3157fc26f9995282165111df9 | |
| parent | 6fdd5d9563439285df200f7282f0ca68152ef72d (diff) | |
Downgrade errors in object_ownercheck() to internal
The "does not exist" errors in object_ownership() were written as
ereport(), suggesting that they are user-facing. But no code path
except one can reach this function without first checking that the
object exists. If this were actually a user-facing error message,
then there would be some problems: get_object_class_descr() is meant
to be for internal errors only and does not support translation.
The one case that can reach this without first checking the object
existence is from be_lo_unlink(). (This makes some sense since large
objects are referred to by their OID directly.) In this one case, we
can add a line of code to check the object existence explicitly,
consistent with other LO code.
For the rest, downgrade the error messages to elog()s. The new
message wordings are the same as in DropObjectById().
Reviewed-by: Alvaro Herrera <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/[email protected]
| -rw-r--r-- | src/backend/catalog/aclchk.c | 10 | ||||
| -rw-r--r-- | src/backend/libpq/be-fsstubs.c | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index b196294fb29..bd006931938 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -4082,9 +4082,8 @@ object_ownercheck(Oid classid, Oid objectid, Oid roleid) tuple = SearchSysCache1(cacheid, ObjectIdGetDatum(objectid)); if (!HeapTupleIsValid(tuple)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("%s with OID %u does not exist", get_object_class_descr(classid), objectid))); + elog(ERROR, "cache lookup failed for %s %u", + get_object_class_descr(classid), objectid); ownerId = DatumGetObjectId(SysCacheGetAttrNotNull(cacheid, tuple, @@ -4113,9 +4112,8 @@ object_ownercheck(Oid classid, Oid objectid, Oid roleid) tuple = systable_getnext(scan); if (!HeapTupleIsValid(tuple)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("%s with OID %u does not exist", get_object_class_descr(classid), objectid))); + elog(ERROR, "could not find tuple for %s %u", + get_object_class_descr(classid), objectid); ownerId = DatumGetObjectId(heap_getattr(tuple, get_object_attnum_owner(classid), diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index a272e82b850..e5a34c61931 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -317,6 +317,11 @@ be_lo_unlink(PG_FUNCTION_ARGS) PreventCommandIfReadOnly("lo_unlink()"); + if (!LargeObjectExists(lobjId)) + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("large object %u does not exist", lobjId))); + /* * Must be owner of the large object. It would be cleaner to check this * in inv_drop(), but we want to throw the error before not after closing |