Fix bug in GRAPH when a bad dependent variable was specified.

Found by zzuf.

diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c
index 65c03bbf79dc61985332b2f2123198a45d33a2ef..da74afdef4e82c4eb8784bbb538b8757af8df3a1 100644 (file)
--- a/src/language/stats/graph.c
+++ b/src/language/stats/graph.c
@@ -245,6 +245,8 @@ parse_function (struct lexer *lexer, struct graph *graph)
       for (v = 0; v < ag_func[i].arity; ++v)
        {
          graph->dep_vars[v] = parse_variable (lexer, graph->dict);
+         if (! graph->dep_vars[v])
+           goto error;
        }
 
       if (!lex_force_match (lexer, T_RPAREN))

diff --git a/tests/language/stats/graph.at b/tests/language/stats/graph.at
index b08f9f26d9a52b4d540cfb669b888786313e584a..f9daa69cbb2f89d53415021ca2777e7f6d506354 100644 (file)
--- a/tests/language/stats/graph.at
+++ b/tests/language/stats/graph.at
@@ -307,4 +307,26 @@ GRAPH /BAR = MINIMUM(y) BY z BY y.
 AT_CHECK([pspp -o pspp.pdf barchart.sps], [0], [ignore])
 dnl Ignore output -- this is just a no-crash check.
 
+AT_CLEANUP
+
+
+
+
+
+AT_SETUP([GRAPH buggy syntax])
+
+AT_DATA([barchart.sps], [dnl
+data list notable list /x y z*.
+begin data
+1  1  3
+2  1  4
+10  2  4
+end data.
+
+GRAPH /BAR = MINIMUM({) BY z BY y.
+])
+
+AT_CHECK([pspp -o pspp.pdf barchart.sps], [1], [ignore])
+dnl Ignore output -- this is just a no-crash check.
+
 AT_CLEANUP
\ No newline at end of file