Add a defense to prevent storing pseudo-type data into index columns.

tglsfdc · tglsfdc · commit 5b5ee14a4be3 · 2008-10-14T21:47:39.000Z
Formerly, the lack of any opclasses that could accept such data was enough
of a defense, but now with a "record" opclass we need to check more carefully.
(You can still use that opclass for an index, but you have to store a named
composite type not an anonymous one.)
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.305 2008/09/30 10:52:12 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.306 2008/10/14 21:47:39 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -236,6 +236,17 @@ ConstructTupleDescriptor(Relation heapRelation,
 			to->attislocal = true;
 
 			ReleaseSysCache(tuple);
+
+			/*
+			 * Make sure the expression yields a type that's safe to store in
+			 * an index.  We need this defense because we have index opclasses
+			 * for pseudo-types such as "record", and the actually stored type
+			 * had better be safe; eg, a named composite type is okay, an
+			 * anonymous record type is not.  The test is the same as for
+			 * whether a table column is of a safe type (which is why we
+			 * needn't check for the non-expression case).
+			 */
+			CheckAttributeType(NameStr(to->attname), to->atttypid);
 		}
 
 		/*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.305 2008/09/30 10:52:12 heikki Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.306 2008/10/14 21:47:39 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -236,6 +236,17 @@ ConstructTupleDescriptor(Relation heapRelation,`
`236`	`236`	`to->attislocal = true;`
`237`	`237`
`238`	`238`	`ReleaseSysCache(tuple);`
	`239`	`+`
	`240`	`+ /*`
	`241`	`+ * Make sure the expression yields a type that's safe to store in`
	`242`	`+ * an index. We need this defense because we have index opclasses`
	`243`	`+ * for pseudo-types such as "record", and the actually stored type`
	`244`	`+ * had better be safe; eg, a named composite type is okay, an`
	`245`	`+ * anonymous record type is not. The test is the same as for`
	`246`	`+ * whether a table column is of a safe type (which is why we`
	`247`	`+ * needn't check for the non-expression case).`
	`248`	`+ */`
	`249`	`+ CheckAttributeType(NameStr(to->attname), to->atttypid);`
`239`	`250`	`}`
`240`	`251`
`241`	`252`	`/*`