Check for attributeList is NULL in ConstructTupleDescriptor ().

Submitted by Raymond Toy.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 9a153741ca2..13f74ae1997 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.14 1997/03/27 04:13:44 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.15 1997/04/05 03:36:21 vadim Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -369,9 +369,13 @@ ConstructTupleDescriptor(Oid heapoid,
 	if (atnum > natts)
 	    elog(WARN, "Cannot create index: attribute %d does not exist",
 		 atnum);
-	IndexKey = (IndexElem*) lfirst(attributeList);
-	attributeList = lnext(attributeList);
-	IndexKeyType = IndexKey->tname;
+	if (attributeList) {
+	  IndexKey = (IndexElem*) lfirst(attributeList);
+	  attributeList = lnext(attributeList);
+	  IndexKeyType = IndexKey->tname;
+	} else {
+	  IndexKeyType = NULL;
+	}
 	
 	indexTupDesc->attrs[i] = (AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE);