parseTypeString wasn't quite paranoid enough.

tglsfdc · tglsfdc · commit 13e8be42bd51 · 2002-08-08T01:22:35.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.47 2002/08/02 18:15:07 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.48 2002/08/08 01:22:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -461,6 +461,8 @@ parseTypeString(const char *str, Oid *type_id, int32 *typmod)
 		elog(ERROR, "parseTypeString: Invalid type name '%s'", str);
 	typecast = (TypeCast *) restarget->val;
 	if (typecast == NULL ||
+		!IsA(typecast, TypeCast) ||
+		typecast->arg == NULL ||
 		!IsA(typecast->arg, A_Const))
 		elog(ERROR, "parseTypeString: Invalid type name '%s'", str);
 	typename = typecast->typename;

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.47 2002/08/02 18:15:07 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.48 2002/08/08 01:22:35 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -461,6 +461,8 @@ parseTypeString(const char str, Oid type_id, int32 *typmod)`
`461`	`461`	`elog(ERROR, "parseTypeString: Invalid type name '%s'", str);`
`462`	`462`	`typecast = (TypeCast *) restarget->val;`
`463`	`463`	`if (typecast == NULL \|\|`
	`464`	`+ !IsA(typecast, TypeCast) \|\|`
	`465`	`+ typecast->arg == NULL \|\|`
`464`	`466`	`!IsA(typecast->arg, A_Const))`
`465`	`467`	`elog(ERROR, "parseTypeString: Invalid type name '%s'", str);`
`466`	`468`	`typename = typecast->typename;`