Back-patch typeTypeName() fix into REL7_0.

tglsfdc · tglsfdc · commit 91ccad9f89ba · 2000-06-06T16:51:24.000Z
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.29 2000/01/26 05:56:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.29.2.1 2000/06/06 16:51:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,7 +48,8 @@ typeidTypeName(Oid id)
 		return NULL;
 	}
 	typetuple = (Form_pg_type) GETSTRUCT(tup);
-	return NameStr(typetuple->typname);
+	/* pstrdup here because result may need to outlive the syscache entry */
+	return pstrdup(NameStr(typetuple->typname));
 }
 
 /* return a Type structure, given a type id */
@@ -119,7 +120,8 @@ typeTypeName(Type t)
 	Form_pg_type typ;
 
 	typ = (Form_pg_type) GETSTRUCT(t);
-	return NameStr(typ->typname);
+	/* pstrdup here because result may need to outlive the syscache entry */
+	return pstrdup(NameStr(typ->typname));
 }
 
 /* given a type, return its typetype ('c' for 'c'atalog types) */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.29 2000/01/26 05:56:42 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.29.2.1 2000/06/06 16:51:24 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -48,7 +48,8 @@ typeidTypeName(Oid id)`
`48`	`48`	`return NULL;`
`49`	`49`	`}`
`50`	`50`	`typetuple = (Form_pg_type) GETSTRUCT(tup);`
`51`		`- return NameStr(typetuple->typname);`
	`51`	`+ /* pstrdup here because result may need to outlive the syscache entry */`
	`52`	`+ return pstrdup(NameStr(typetuple->typname));`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`/* return a Type structure, given a type id */`
`@@ -119,7 +120,8 @@ typeTypeName(Type t)`
`119`	`120`	`Form_pg_type typ;`
`120`	`121`
`121`	`122`	`typ = (Form_pg_type) GETSTRUCT(t);`
`122`		`- return NameStr(typ->typname);`
	`123`	`+ /* pstrdup here because result may need to outlive the syscache entry */`
	`124`	`+ return pstrdup(NameStr(typ->typname));`
`123`	`125`	`}`
`124`	`126`
`125`	`127`	`/* given a type, return its typetype ('c' for 'c'atalog types) */`