[Pspp-cvs] Changes to pspp/src/var-display.c

[Ben Pfaff]

Index: pspp/src/var-display.c
diff -u pspp/src/var-display.c:1.2 pspp/src/var-display.c:1.3
--- pspp/src/var-display.c:1.2  Fri Apr 29 01:02:16 2005
+++ pspp/src/var-display.c      Mon May  2 06:21:21 2005
@@ -56,11 +56,19 @@
            align = ALIGN_RIGHT;
          else if ( lex_match_id("CENTER"))
            align = ALIGN_CENTRE;
-         else
-           return CMD_FAILURE;
+         else 
+            {
+              free (v);
+              return CMD_FAILURE; 
+            }
 
          lex_force_match(')');
        }
+      else 
+        {
+          free (v);
+          return CMD_FAILURE; 
+        }
 
       for( i = 0 ; i < nv ; ++i ) 
        v[i]->alignment = align;
@@ -134,12 +142,20 @@
            level = MEASURE_ORDINAL;
          else if ( lex_match_id("NOMINAL"))
            level = MEASURE_NOMINAL;
-         else
-           return CMD_FAILURE;
+         else 
+            {
+              free (v);
+              return CMD_FAILURE; 
+            }
 
          lex_force_match(')');
        }
-
+      else
+        {
+          free (v);
+          return CMD_FAILURE; 
+        }
+      
       for( i = 0 ; i < nv ; ++i ) 
        v[i]->measure = level ;