Changeset 9745

Timestamp:

Oct 24, 2006, 6:58:39 PM (20 years ago)

Author:

drobbin

Message:

Fixed LookupTable to error when a partially-constructed table row is encountered. Also fixed memory leak associated with this case.

Location:

trunk/psLib

Files:

• src/types/psLookupTable.c (modified) (2 diffs)
• test/types/tap_psLookupTable_all.c (modified) (2 diffs)

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-24 22:52:56 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-25 04:58:38 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -564 +564 @@
                             return NULL;
                         }
+                    }
+                    if (strValue != NULL && strNum == NULL) {
+                        psError(PS_ERR_UNKNOWN, true,
+                                "Parsing text file failed - missing table value(s).");
+                        fclose(fp);
+                        psFree(outputArray);
+                        psFree(line);
+                        psFree(strValue);
+                        return NULL;
                     }
                 }  // ignore line

trunk/psLib/test/types/tap_psLookupTable_all.c

@@ -24 +24 @@
 int main(void)
 {
-    plan_tests(27);
+    plan_tests(28);
 
     diag("Tests for psLookupTable Functions");
@@ -149 +149 @@
             "psVectorsReadFromFile:           return NULL for empty table.");
     }
+    // Attempt to read from file with partially constructed row
+    {
+        outVec = psVectorsReadFromFile("table3.dat",
+                                       "\%f \%d \%d \%ld \%d \%d \%d \%ld \%*d \%lf");
+        ok( outVec == NULL,
+            "psVectorsReadFromFile:           return NULL for table with partially"
+            " constructed row.");
+    }
     //Attempt to read with valid inputs
     {