Changeset 4366 for trunk/psLib/src/dataIO/psLookupTable.c

Timestamp:

Jun 22, 2005, 5:19:29 PM (21 years ago)

Author:

desonia

Message:

modified psLookupTableRead to take a long indexCol and added check for
an invalidly large indexCol for psLookupTableImport.

File:

• trunk/psLib/src/dataIO/psLookupTable.c (modified) (3 diffs)

trunk/psLib/src/dataIO/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-20 22:42:29 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-23 03:19:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -548 +548 @@
 }
 
-psLookupTable *psLookupTableImport(psLookupTable *table, const psArray *vectors, int indexCol)
+psLookupTable *psLookupTableImport(psLookupTable *table, const psArray *vectors, long indexCol)
 {
     psLookupTable* outputTable = NULL;
@@ -564 +564 @@
     if(indexCol < 0 ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column cannot be less than zero");
+        return NULL;
+    }
+
+    if (indexCol >= vectors->n) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Index column, %d, is larger than number of columns, %d.",
+                indexCol, vectors->n);
         return NULL;
     }