]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Remove NULL dereference from RenameRelationInternal().
authorNoah Misch <noah@leadboat.com>
Sun, 29 Sep 2024 22:54:25 +0000 (15:54 -0700)
committerNoah Misch <noah@leadboat.com>
Sun, 29 Sep 2024 22:54:30 +0000 (15:54 -0700)
Defect in last week's commit aac2c9b4fde889d13f859c233c2523345e72d32b,
per Coverity.  Reaching this would need catalog corruption.  Back-patch
to v12, like that commit.

src/backend/commands/tablecmds.c

index 346dc587d7c748d29b78cec5895939286b7f40ea..ff2b36d669984d7972947f2da8eadb1fcd4bc2d2 100644 (file)
@@ -3640,9 +3640,9 @@ RenameRelationInternal(Oid myrelid, const char *newrelname, bool is_internal, bo
        relrelation = table_open(RelationRelationId, RowExclusiveLock);
 
        reltup = SearchSysCacheLockedCopy1(RELOID, ObjectIdGetDatum(myrelid));
-       otid = reltup->t_self;
        if (!HeapTupleIsValid(reltup))  /* shouldn't happen */
                elog(ERROR, "cache lookup failed for relation %u", myrelid);
+       otid = reltup->t_self;
        relform = (Form_pg_class) GETSTRUCT(reltup);
 
        if (get_relname_relid(newrelname, namespaceId) != InvalidOid)