Avoid potential relcache leak in objectaddress.c.

robertmhaas · robertmhaas · commit 393e828e31a2 · 2011-10-14T11:35:40.000-04:00
Nobody using the missing_ok flag yet, but let's speculate that this will
be a better interface for future callers.

KaiGai Kohei, with some adjustments by me.
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
@@ -639,7 +639,8 @@ get_object_address_relobject(ObjectType objtype, List *objname,
 		 * Caller is expecting to get back the relation, even though we
 		 * didn't end up using it to find the rule.
 		 */
-		relation = heap_open(reloid, AccessShareLock);
+		if (OidIsValid(address.objectId))
+			relation = heap_open(reloid, AccessShareLock);
 	}
 	else
 	{
@@ -677,6 +678,14 @@ get_object_address_relobject(ObjectType objtype, List *objname,
 				address.objectId = InvalidOid;
 				address.objectSubId = 0;
 		}
+
+		/* Avoid relcache leak when object not found. */
+		if (!OidIsValid(address.objectId))
+		{
+			heap_close(relation, AccessShareLock);
+			relation = NULL;		/* department of accident prevention */
+			return address;
+		}
 	}
 
 	/* Done. */

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,8 @@ get_object_address_relobject(ObjectType objtype, List *objname,`
`639`	`639`	`* Caller is expecting to get back the relation, even though we`
`640`	`640`	`* didn't end up using it to find the rule.`
`641`	`641`	`*/`
`642`		`- relation = heap_open(reloid, AccessShareLock);`
	`642`	`+ if (OidIsValid(address.objectId))`
	`643`	`+ relation = heap_open(reloid, AccessShareLock);`
`643`	`644`	`}`
`644`	`645`	`else`
`645`	`646`	`{`
`@@ -677,6 +678,14 @@ get_object_address_relobject(ObjectType objtype, List *objname,`
`677`	`678`	`address.objectId = InvalidOid;`
`678`	`679`	`address.objectSubId = 0;`
`679`	`680`	`}`
	`681`	`+`
	`682`	`+ /* Avoid relcache leak when object not found. */`
	`683`	`+ if (!OidIsValid(address.objectId))`
	`684`	`+ {`
	`685`	`+ heap_close(relation, AccessShareLock);`
	`686`	`+ relation = NULL; /* department of accident prevention */`
	`687`	`+ return address;`
	`688`	`+ }`
`680`	`689`	`}`
`681`	`690`
`682`	`691`	`/* Done. */`